public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: varkabhadram@gmail.com
To: netdev@vger.kernel.org
Cc: Thomas.Lendacky@amd.com, geert+renesas@linux-m68k.org,
	ebiederm@xmission.com, macro@linux-mips.org,
	linux-kernel@vger.kernel.org, davem@davemloft.net,
	Varka Bhadram <varkab@cdac.in>
Subject: [PATCH net-next 8/8] ethernet: amd: switch case fixes
Date: Fri, 11 Jul 2014 13:05:10 +0530	[thread overview]
Message-ID: <1405064110-22579-9-git-send-email-varkabhadram@gmail.com> (raw)
In-Reply-To: <1405064110-22579-1-git-send-email-varkabhadram@gmail.com>

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(-)

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;
-- 
1.7.9.5


  parent reply	other threads:[~2014-07-11  7:37 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-11  7:35 [PATCH net-next 0/8] cleanup for AMD811E ethernet driver varkabhadram
2014-07-11  7:35 ` [PATCH net-next 1/8] ethernet: amd: move amd111e_remove_one after probe varkabhadram
2014-07-11  7:35 ` [PATCH net-next 2/8] ethernet: amd: use devm_ioremap() varkabhadram
2014-07-11  7:35 ` [PATCH net-next 3/8] ethernet: amd: dynamic debug fixes varkabhadram
2014-07-11  7:35 ` [PATCH net-next 4/8] ethernet: amd: fix comment styles varkabhadram
2014-07-11  7:35 ` [PATCH net-next 5/8] ethernet: amd: move pci device ids varkabhadram
2014-07-11  7:35 ` [PATCH net-next 6/8] ethernet: amd: fix 'foo* bar' varkabhadram
2014-07-11  7:35 ` [PATCH net-next 7/8] ethernet: amd: fix spaces and few coding styles varkabhadram
2014-07-11  7:35 ` varkabhadram [this message]
2014-07-11  7:47   ` [PATCH net-next 8/8] ethernet: amd: switch case fixes Geert Uytterhoeven
2014-07-11  9:48 ` [PATCH net-next 0/8] cleanup for AMD811E ethernet driver Varka Bhadram

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1405064110-22579-9-git-send-email-varkabhadram@gmail.com \
    --to=varkabhadram@gmail.com \
    --cc=Thomas.Lendacky@amd.com \
    --cc=davem@davemloft.net \
    --cc=ebiederm@xmission.com \
    --cc=geert+renesas@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=macro@linux-mips.org \
    --cc=netdev@vger.kernel.org \
    --cc=varkab@cdac.in \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox