diff mbox

[net-next,8/8] ethernet: amd: switch case fixes

Message ID 1405064110-22579-9-git-send-email-varkabhadram@gmail.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Varka Bhadram July 11, 2014, 7:35 a.m. UTC 
From: Varka Bhadram <varkab@cdac.in>

This patch fix the *swith* case indentation and usage issues

Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
 drivers/net/ethernet/amd/amd8111e.c |  117 +++++++++++++++++------------------
 1 file changed, 58 insertions(+), 59 deletions(-)

Comments

Geert Uytterhoeven July 11, 2014, 7:47 a.m. UTC | #1 
On Fri, Jul 11, 2014 at 9:35 AM,  <varkabhadram@gmail.com> wrote:
> --- a/drivers/net/ethernet/amd/amd8111e.c
> +++ b/drivers/net/ethernet/amd/amd8111e.c
> @@ -197,23 +197,24 @@ static void amd8111e_set_ext_phy(struct net_device *dev)
>         advert = amd8111e_mdio_read(dev, lp->ext_phy_addr, MII_ADVERTISE);
>         tmp = advert & ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
>         switch (lp->ext_phy_option) {
> -               default:

Behavior change from fall through and consider as auto-negotation...

> -               case SPEED_AUTONEG: /* advertise all values */
> -                       tmp |= (ADVERTISE_10HALF | ADVERTISE_10FULL |
> -                               ADVERTISE_100HALF | ADVERTISE_100FULL);
> -                       break;
> -               case SPEED10_HALF:
> -                       tmp |= ADVERTISE_10HALF;
> -                       break;
> -               case SPEED10_FULL:
> -                       tmp |= ADVERTISE_10FULL;
> -                       break;
> -               case SPEED100_HALF:
> -                       tmp |= ADVERTISE_100HALF;
> -                       break;
> -               case SPEED100_FULL:
> -                       tmp |= ADVERTISE_100FULL;
> -                       break;
> +       case SPEED_AUTONEG: /* advertise all values */
> +               tmp |= (ADVERTISE_10HALF | ADVERTISE_10FULL |
> +                       ADVERTISE_100HALF | ADVERTISE_100FULL);
> +               break;
> +       case SPEED10_HALF:
> +               tmp |= ADVERTISE_10HALF;
> +               break;
> +       case SPEED10_FULL:
> +               tmp |= ADVERTISE_10FULL;
> +               break;
> +       case SPEED100_HALF:
> +               tmp |= ADVERTISE_100HALF;
> +               break;
> +       case SPEED100_FULL:
> +               tmp |= ADVERTISE_100FULL;
> +               break;
> +       default:

... to do nothing.

> +               break;
>         }

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index f0d3809..ab2e09b9 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -197,23 +197,24 @@  static void amd8111e_set_ext_phy(struct net_device *dev)
 	advert = amd8111e_mdio_read(dev, lp->ext_phy_addr, MII_ADVERTISE);
 	tmp = advert & ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
 	switch (lp->ext_phy_option) {
-		default:
-		case SPEED_AUTONEG: /* advertise all values */
-			tmp |= (ADVERTISE_10HALF | ADVERTISE_10FULL |
-				ADVERTISE_100HALF | ADVERTISE_100FULL);
-			break;
-		case SPEED10_HALF:
-			tmp |= ADVERTISE_10HALF;
-			break;
-		case SPEED10_FULL:
-			tmp |= ADVERTISE_10FULL;
-			break;
-		case SPEED100_HALF:
-			tmp |= ADVERTISE_100HALF;
-			break;
-		case SPEED100_FULL:
-			tmp |= ADVERTISE_100FULL;
-			break;
+	case SPEED_AUTONEG: /* advertise all values */
+		tmp |= (ADVERTISE_10HALF | ADVERTISE_10FULL |
+			ADVERTISE_100HALF | ADVERTISE_100FULL);
+		break;
+	case SPEED10_HALF:
+		tmp |= ADVERTISE_10HALF;
+		break;
+	case SPEED10_FULL:
+		tmp |= ADVERTISE_10FULL;
+		break;
+	case SPEED100_HALF:
+		tmp |= ADVERTISE_100HALF;
+		break;
+	case SPEED100_FULL:
+		tmp |= ADVERTISE_100FULL;
+		break;
+	default:
+		break;
 	}
 
 	if (advert != tmp)
@@ -383,49 +384,47 @@  static int amd8111e_set_coalesce(struct net_device *dev, enum coal_mode cmod)
 	void __iomem *mmio = lp->mmio;
 	struct amd8111e_coalesce_conf *coal_conf = &lp->coal_conf;
 
+	switch (cmod) {
+	case RX_INTR_COAL:
+		timeout = coal_conf->rx_timeout;
+		event_count = coal_conf->rx_event_count;
+		if (timeout > MAX_TIMEOUT ||
+		    event_count > MAX_EVENT_COUNT)
+			return -EINVAL;
+
+		timeout = timeout * DELAY_TIMER_CONV;
+		writel(VAL0 | STINTEN, mmio + INTEN0);
+		writel((u32)DLY_INT_A_R0 | (event_count << 16) |
+		       timeout, mmio+DLY_INT_A);
+		break;
 
-	switch (cmod)
-	{
-		case RX_INTR_COAL:
-			timeout = coal_conf->rx_timeout;
-			event_count = coal_conf->rx_event_count;
-			if (timeout > MAX_TIMEOUT ||
-			    event_count > MAX_EVENT_COUNT)
-				return -EINVAL;
-
-			timeout = timeout * DELAY_TIMER_CONV;
-			writel(VAL0 | STINTEN, mmio + INTEN0);
-			writel((u32)DLY_INT_A_R0 | (event_count << 16) |
-			       timeout, mmio+DLY_INT_A);
-			break;
-
-		case TX_INTR_COAL:
-			timeout = coal_conf->tx_timeout;
-			event_count = coal_conf->tx_event_count;
-			if (timeout > MAX_TIMEOUT ||
-			    event_count > MAX_EVENT_COUNT)
-				return -EINVAL;
-
-
-			timeout = timeout * DELAY_TIMER_CONV;
-			writel(VAL0 | STINTEN, mmio + INTEN0);
-			writel((u32)DLY_INT_B_T0 | (event_count << 16) |
-			       timeout, mmio + DLY_INT_B);
-			break;
-
-		case DISABLE_COAL:
-			writel(0, mmio + STVAL);
-			writel(STINTEN, mmio + INTEN0);
-			writel(0, mmio + DLY_INT_B);
-			writel(0, mmio + DLY_INT_A);
-			break;
-		 case ENABLE_COAL:
-		       /* Start the timer (0.5 sec) */
-			writel((u32)SOFT_TIMER_FREQ, mmio + STVAL);
-			writel(VAL0 | STINTEN, mmio + INTEN0);
-			break;
-		default:
-			break;
+	case TX_INTR_COAL:
+		timeout = coal_conf->tx_timeout;
+		event_count = coal_conf->tx_event_count;
+		if (timeout > MAX_TIMEOUT ||
+		    event_count > MAX_EVENT_COUNT)
+			return -EINVAL;
+
+		timeout = timeout * DELAY_TIMER_CONV;
+		writel(VAL0 | STINTEN, mmio + INTEN0);
+		writel((u32)DLY_INT_B_T0 | (event_count << 16) |
+		       timeout, mmio + DLY_INT_B);
+		break;
+
+	case DISABLE_COAL:
+		writel(0, mmio + STVAL);
+		writel(STINTEN, mmio + INTEN0);
+		writel(0, mmio + DLY_INT_B);
+		writel(0, mmio + DLY_INT_A);
+		break;
+
+	case ENABLE_COAL:
+		/* Start the timer (0.5 sec) */
+		writel((u32)SOFT_TIMER_FREQ, mmio + STVAL);
+		writel(VAL0 | STINTEN, mmio + INTEN0);
+		break;
+	default:
+		break;
 	}
 
 	return 0;