diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2006-12-05 16:38:00 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 16:58:43 -0500 |
commit | c697f83e8c880a1e69fb2a45a6e4aa0670e10602 (patch) | |
tree | 27cd53ac86ccd5f1ae644d7cf074a05740b8db2b | |
parent | ea8862dc86c0f5a0be012a0f2e9de1b2ccabbaa5 (diff) |
chelsio: move return, break and continue statements on their own line
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
-rw-r--r-- | drivers/net/chelsio/espi.c | 3 | ||||
-rw-r--r-- | drivers/net/chelsio/ixf1010.c | 9 | ||||
-rw-r--r-- | drivers/net/chelsio/mv88e1xxx.c | 6 | ||||
-rw-r--r-- | drivers/net/chelsio/subr.c | 6 | ||||
-rw-r--r-- | drivers/net/chelsio/vsc7326.c | 3 | ||||
-rw-r--r-- | drivers/net/chelsio/vsc8244.c | 3 |
6 files changed, 20 insertions, 10 deletions
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c index 4192f0f5b3ee..44d2603bb010 100644 --- a/drivers/net/chelsio/espi.c +++ b/drivers/net/chelsio/espi.c | |||
@@ -301,7 +301,8 @@ void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val) | |||
301 | { | 301 | { |
302 | struct peespi *espi = adapter->espi; | 302 | struct peespi *espi = adapter->espi; |
303 | 303 | ||
304 | if (!is_T2(adapter)) return; | 304 | if (!is_T2(adapter)) |
305 | return; | ||
305 | spin_lock(&espi->lock); | 306 | spin_lock(&espi->lock); |
306 | espi->misc_ctrl = (val & ~MON_MASK) | | 307 | espi->misc_ctrl = (val & ~MON_MASK) | |
307 | (espi->misc_ctrl & MON_MASK); | 308 | (espi->misc_ctrl & MON_MASK); |
diff --git a/drivers/net/chelsio/ixf1010.c b/drivers/net/chelsio/ixf1010.c index 5b8f144e83d4..91a5bf711b8f 100644 --- a/drivers/net/chelsio/ixf1010.c +++ b/drivers/net/chelsio/ixf1010.c | |||
@@ -273,7 +273,8 @@ static int mac_set_rx_mode(struct cmac *mac, struct t1_rx_mode *rm) | |||
273 | static int mac_set_mtu(struct cmac *mac, int mtu) | 273 | static int mac_set_mtu(struct cmac *mac, int mtu) |
274 | { | 274 | { |
275 | /* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */ | 275 | /* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */ |
276 | if (mtu > (MAX_FRAME_SIZE - 14 - 4)) return -EINVAL; | 276 | if (mtu > (MAX_FRAME_SIZE - 14 - 4)) |
277 | return -EINVAL; | ||
277 | t1_tpi_write(mac->adapter, MACREG(mac, REG_MAX_FRAME_SIZE), | 278 | t1_tpi_write(mac->adapter, MACREG(mac, REG_MAX_FRAME_SIZE), |
278 | mtu + 14 + 4); | 279 | mtu + 14 + 4); |
279 | return 0; | 280 | return 0; |
@@ -460,10 +461,12 @@ static struct cmac *ixf1010_mac_create(adapter_t *adapter, int index) | |||
460 | struct cmac *mac; | 461 | struct cmac *mac; |
461 | u32 val; | 462 | u32 val; |
462 | 463 | ||
463 | if (index > 9) return NULL; | 464 | if (index > 9) |
465 | return NULL; | ||
464 | 466 | ||
465 | mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL); | 467 | mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL); |
466 | if (!mac) return NULL; | 468 | if (!mac) |
469 | return NULL; | ||
467 | 470 | ||
468 | mac->ops = &ixf1010_ops; | 471 | mac->ops = &ixf1010_ops; |
469 | mac->instance = (cmac_instance *)(mac + 1); | 472 | mac->instance = (cmac_instance *)(mac + 1); |
diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/chelsio/mv88e1xxx.c index 28ac93ff7c4f..75fac85a55b5 100644 --- a/drivers/net/chelsio/mv88e1xxx.c +++ b/drivers/net/chelsio/mv88e1xxx.c | |||
@@ -308,7 +308,8 @@ static int mv88e1xxx_interrupt_handler(struct cphy *cphy) | |||
308 | MV88E1XXX_INTERRUPT_STATUS_REGISTER, | 308 | MV88E1XXX_INTERRUPT_STATUS_REGISTER, |
309 | &cause); | 309 | &cause); |
310 | cause &= INTR_ENABLE_MASK; | 310 | cause &= INTR_ENABLE_MASK; |
311 | if (!cause) break; | 311 | if (!cause) |
312 | break; | ||
312 | 313 | ||
313 | if (cause & MV88E1XXX_INTR_LINK_CHNG) { | 314 | if (cause & MV88E1XXX_INTR_LINK_CHNG) { |
314 | (void) simple_mdio_read(cphy, | 315 | (void) simple_mdio_read(cphy, |
@@ -360,7 +361,8 @@ static struct cphy *mv88e1xxx_phy_create(adapter_t *adapter, int phy_addr, | |||
360 | { | 361 | { |
361 | struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL); | 362 | struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL); |
362 | 363 | ||
363 | if (!cphy) return NULL; | 364 | if (!cphy) |
365 | return NULL; | ||
364 | 366 | ||
365 | cphy_init(cphy, adapter, phy_addr, &mv88e1xxx_ops, mdio_ops); | 367 | cphy_init(cphy, adapter, phy_addr, &mv88e1xxx_ops, mdio_ops); |
366 | 368 | ||
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c index 22ed9a383c08..38dbaf28d439 100644 --- a/drivers/net/chelsio/subr.c +++ b/drivers/net/chelsio/subr.c | |||
@@ -612,7 +612,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter) | |||
612 | int i, port_bit; | 612 | int i, port_bit; |
613 | for_each_port(adapter, i) { | 613 | for_each_port(adapter, i) { |
614 | port_bit = i + 1; | 614 | port_bit = i + 1; |
615 | if (!(cause & (1 << port_bit))) continue; | 615 | if (!(cause & (1 << port_bit))) |
616 | continue; | ||
616 | 617 | ||
617 | phy = adapter->port[i].phy; | 618 | phy = adapter->port[i].phy; |
618 | phy_cause = phy->ops->interrupt_handler(phy); | 619 | phy_cause = phy->ops->interrupt_handler(phy); |
@@ -688,7 +689,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter) | |||
688 | 689 | ||
689 | for_each_port(adapter, i) { | 690 | for_each_port(adapter, i) { |
690 | port_bit = i ? i + 1 : 0; | 691 | port_bit = i ? i + 1 : 0; |
691 | if (!(cause & (1 << port_bit))) continue; | 692 | if (!(cause & (1 << port_bit))) |
693 | continue; | ||
692 | 694 | ||
693 | phy = adapter->port[i].phy; | 695 | phy = adapter->port[i].phy; |
694 | phy_cause = phy->ops->interrupt_handler(phy); | 696 | phy_cause = phy->ops->interrupt_handler(phy); |
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/chelsio/vsc7326.c index 85dc3b1dc309..335544132ee3 100644 --- a/drivers/net/chelsio/vsc7326.c +++ b/drivers/net/chelsio/vsc7326.c | |||
@@ -686,7 +686,8 @@ static struct cmac *vsc7326_mac_create(adapter_t *adapter, int index) | |||
686 | int i; | 686 | int i; |
687 | 687 | ||
688 | mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL); | 688 | mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL); |
689 | if (!mac) return NULL; | 689 | if (!mac) |
690 | return NULL; | ||
690 | 691 | ||
691 | mac->ops = &vsc7326_ops; | 692 | mac->ops = &vsc7326_ops; |
692 | mac->instance = (cmac_instance *)(mac + 1); | 693 | mac->instance = (cmac_instance *)(mac + 1); |
diff --git a/drivers/net/chelsio/vsc8244.c b/drivers/net/chelsio/vsc8244.c index c493e783d459..f947cf6059b1 100644 --- a/drivers/net/chelsio/vsc8244.c +++ b/drivers/net/chelsio/vsc8244.c | |||
@@ -347,7 +347,8 @@ static struct cphy* vsc8244_phy_create(adapter_t *adapter, int phy_addr, struct | |||
347 | { | 347 | { |
348 | struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL); | 348 | struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL); |
349 | 349 | ||
350 | if (!cphy) return NULL; | 350 | if (!cphy) |
351 | return NULL; | ||
351 | 352 | ||
352 | cphy_init(cphy, adapter, phy_addr, &vsc8244_ops, mdio_ops); | 353 | cphy_init(cphy, adapter, phy_addr, &vsc8244_ops, mdio_ops); |
353 | 354 | ||