diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2010-04-05 06:19:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-06 06:58:02 -0400 |
commit | 33f401aec709e4fea414e5a4cf81b96462bc224f (patch) | |
tree | b3681a8bb6be05275b79011f5bde750af2cfe811 /drivers/net/tg3.c | |
parent | c6cdf43631c4108b38b872136c926691e987880f (diff) |
tg3: The case of switches
This patch fixes checkpatch errors related to switch statements.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 9b8d8a227281..7314919b9e08 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -581,11 +581,11 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum) | |||
581 | return 0; | 581 | return 0; |
582 | 582 | ||
583 | switch (locknum) { | 583 | switch (locknum) { |
584 | case TG3_APE_LOCK_GRC: | 584 | case TG3_APE_LOCK_GRC: |
585 | case TG3_APE_LOCK_MEM: | 585 | case TG3_APE_LOCK_MEM: |
586 | break; | 586 | break; |
587 | default: | 587 | default: |
588 | return -EINVAL; | 588 | return -EINVAL; |
589 | } | 589 | } |
590 | 590 | ||
591 | off = 4 * locknum; | 591 | off = 4 * locknum; |
@@ -619,11 +619,11 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum) | |||
619 | return; | 619 | return; |
620 | 620 | ||
621 | switch (locknum) { | 621 | switch (locknum) { |
622 | case TG3_APE_LOCK_GRC: | 622 | case TG3_APE_LOCK_GRC: |
623 | case TG3_APE_LOCK_MEM: | 623 | case TG3_APE_LOCK_MEM: |
624 | break; | 624 | break; |
625 | default: | 625 | default: |
626 | return; | 626 | return; |
627 | } | 627 | } |
628 | 628 | ||
629 | off = 4 * locknum; | 629 | off = 4 * locknum; |
@@ -3428,7 +3428,7 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp, | |||
3428 | ap->rxconfig = rx_cfg_reg; | 3428 | ap->rxconfig = rx_cfg_reg; |
3429 | ret = ANEG_OK; | 3429 | ret = ANEG_OK; |
3430 | 3430 | ||
3431 | switch(ap->state) { | 3431 | switch (ap->state) { |
3432 | case ANEG_STATE_UNKNOWN: | 3432 | case ANEG_STATE_UNKNOWN: |
3433 | if (ap->flags & (MR_AN_ENABLE | MR_RESTART_AN)) | 3433 | if (ap->flags & (MR_AN_ENABLE | MR_RESTART_AN)) |
3434 | ap->state = ANEG_STATE_AN_ENABLE; | 3434 | ap->state = ANEG_STATE_AN_ENABLE; |
@@ -6565,35 +6565,35 @@ static void tg3_ape_driver_state_change(struct tg3 *tp, int kind) | |||
6565 | return; | 6565 | return; |
6566 | 6566 | ||
6567 | switch (kind) { | 6567 | switch (kind) { |
6568 | case RESET_KIND_INIT: | 6568 | case RESET_KIND_INIT: |
6569 | tg3_ape_write32(tp, TG3_APE_HOST_SEG_SIG, | 6569 | tg3_ape_write32(tp, TG3_APE_HOST_SEG_SIG, |
6570 | APE_HOST_SEG_SIG_MAGIC); | 6570 | APE_HOST_SEG_SIG_MAGIC); |
6571 | tg3_ape_write32(tp, TG3_APE_HOST_SEG_LEN, | 6571 | tg3_ape_write32(tp, TG3_APE_HOST_SEG_LEN, |
6572 | APE_HOST_SEG_LEN_MAGIC); | 6572 | APE_HOST_SEG_LEN_MAGIC); |
6573 | apedata = tg3_ape_read32(tp, TG3_APE_HOST_INIT_COUNT); | 6573 | apedata = tg3_ape_read32(tp, TG3_APE_HOST_INIT_COUNT); |
6574 | tg3_ape_write32(tp, TG3_APE_HOST_INIT_COUNT, ++apedata); | 6574 | tg3_ape_write32(tp, TG3_APE_HOST_INIT_COUNT, ++apedata); |
6575 | tg3_ape_write32(tp, TG3_APE_HOST_DRIVER_ID, | 6575 | tg3_ape_write32(tp, TG3_APE_HOST_DRIVER_ID, |
6576 | APE_HOST_DRIVER_ID_MAGIC); | 6576 | APE_HOST_DRIVER_ID_MAGIC); |
6577 | tg3_ape_write32(tp, TG3_APE_HOST_BEHAVIOR, | 6577 | tg3_ape_write32(tp, TG3_APE_HOST_BEHAVIOR, |
6578 | APE_HOST_BEHAV_NO_PHYLOCK); | 6578 | APE_HOST_BEHAV_NO_PHYLOCK); |
6579 | 6579 | ||
6580 | event = APE_EVENT_STATUS_STATE_START; | 6580 | event = APE_EVENT_STATUS_STATE_START; |
6581 | break; | 6581 | break; |
6582 | case RESET_KIND_SHUTDOWN: | 6582 | case RESET_KIND_SHUTDOWN: |
6583 | /* With the interface we are currently using, | 6583 | /* With the interface we are currently using, |
6584 | * APE does not track driver state. Wiping | 6584 | * APE does not track driver state. Wiping |
6585 | * out the HOST SEGMENT SIGNATURE forces | 6585 | * out the HOST SEGMENT SIGNATURE forces |
6586 | * the APE to assume OS absent status. | 6586 | * the APE to assume OS absent status. |
6587 | */ | 6587 | */ |
6588 | tg3_ape_write32(tp, TG3_APE_HOST_SEG_SIG, 0x0); | 6588 | tg3_ape_write32(tp, TG3_APE_HOST_SEG_SIG, 0x0); |
6589 | 6589 | ||
6590 | event = APE_EVENT_STATUS_STATE_UNLOAD; | 6590 | event = APE_EVENT_STATUS_STATE_UNLOAD; |
6591 | break; | 6591 | break; |
6592 | case RESET_KIND_SUSPEND: | 6592 | case RESET_KIND_SUSPEND: |
6593 | event = APE_EVENT_STATUS_STATE_SUSPEND; | 6593 | event = APE_EVENT_STATUS_STATE_SUSPEND; |
6594 | break; | 6594 | break; |
6595 | default: | 6595 | default: |
6596 | return; | 6596 | return; |
6597 | } | 6597 | } |
6598 | 6598 | ||
6599 | event |= APE_EVENT_STATUS_DRIVER_EVNT | APE_EVENT_STATUS_STATE_CHNGE; | 6599 | event |= APE_EVENT_STATUS_DRIVER_EVNT | APE_EVENT_STATUS_STATE_CHNGE; |
@@ -11102,7 +11102,7 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
11102 | return phy_mii_ioctl(phydev, data, cmd); | 11102 | return phy_mii_ioctl(phydev, data, cmd); |
11103 | } | 11103 | } |
11104 | 11104 | ||
11105 | switch(cmd) { | 11105 | switch (cmd) { |
11106 | case SIOCGMIIPHY: | 11106 | case SIOCGMIIPHY: |
11107 | data->phy_id = tp->phy_addr; | 11107 | data->phy_id = tp->phy_addr; |
11108 | 11108 | ||