]> err.no Git - linux-2.6/commitdiff
chelsio: move return, break and continue statements on their own line
authorFrancois Romieu <romieu@fr.zoreil.com>
Tue, 5 Dec 2006 21:38:00 +0000 (22:38 +0100)
committerJeff Garzik <jeff@garzik.org>
Mon, 5 Feb 2007 21:58:43 +0000 (16:58 -0500)
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
drivers/net/chelsio/espi.c
drivers/net/chelsio/ixf1010.c
drivers/net/chelsio/mv88e1xxx.c
drivers/net/chelsio/subr.c
drivers/net/chelsio/vsc7326.c
drivers/net/chelsio/vsc8244.c

index 4192f0f5b3ee40c48257079ce65f93fede490c81..44d2603bb010fe01afaf748d8200c470c24d1186 100644 (file)
@@ -301,7 +301,8 @@ void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val)
 {
        struct peespi *espi = adapter->espi;
 
-       if (!is_T2(adapter)) return;
+       if (!is_T2(adapter))
+               return;
        spin_lock(&espi->lock);
        espi->misc_ctrl = (val & ~MON_MASK) |
                          (espi->misc_ctrl & MON_MASK);
index 5b8f144e83d47f926b3164a5c71cd91a6fa1205b..91a5bf711b8fab6c187d9fa7449cb220ec44995a 100644 (file)
@@ -273,7 +273,8 @@ static int mac_set_rx_mode(struct cmac *mac, struct t1_rx_mode *rm)
 static int mac_set_mtu(struct cmac *mac, int mtu)
 {
        /* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */
-       if (mtu > (MAX_FRAME_SIZE - 14 - 4)) return -EINVAL;
+       if (mtu > (MAX_FRAME_SIZE - 14 - 4))
+               return -EINVAL;
        t1_tpi_write(mac->adapter, MACREG(mac, REG_MAX_FRAME_SIZE),
                     mtu + 14 + 4);
        return 0;
@@ -460,10 +461,12 @@ static struct cmac *ixf1010_mac_create(adapter_t *adapter, int index)
        struct cmac *mac;
        u32 val;
 
-       if (index > 9) return NULL;
+       if (index > 9)
+               return NULL;
 
        mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL);
-       if (!mac) return NULL;
+       if (!mac)
+               return NULL;
 
        mac->ops = &ixf1010_ops;
        mac->instance = (cmac_instance *)(mac + 1);
index 28ac93ff7c4f6a04c2392a22e334186aa9bca7fd..75fac85a55b5660b2fda323926f2636f33c5a3c8 100644 (file)
@@ -308,7 +308,8 @@ static int mv88e1xxx_interrupt_handler(struct cphy *cphy)
                                MV88E1XXX_INTERRUPT_STATUS_REGISTER,
                                &cause);
                cause &= INTR_ENABLE_MASK;
-               if (!cause) break;
+               if (!cause)
+                       break;
 
                if (cause & MV88E1XXX_INTR_LINK_CHNG) {
                        (void) simple_mdio_read(cphy,
@@ -360,7 +361,8 @@ static struct cphy *mv88e1xxx_phy_create(adapter_t *adapter, int phy_addr,
 {
        struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);
 
-       if (!cphy) return NULL;
+       if (!cphy)
+               return NULL;
 
        cphy_init(cphy, adapter, phy_addr, &mv88e1xxx_ops, mdio_ops);
 
index 22ed9a383c0814cef941b5e0402e7e08a287e52c..38dbaf28d4396a148bd9030e52e1847731689205 100644 (file)
@@ -612,7 +612,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
                 int i, port_bit;
                for_each_port(adapter, i) {
                        port_bit = i + 1;
-                       if (!(cause & (1 << port_bit))) continue;
+                       if (!(cause & (1 << port_bit)))
+                               continue;
 
                        phy = adapter->port[i].phy;
                        phy_cause = phy->ops->interrupt_handler(phy);
@@ -688,7 +689,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
 
                        for_each_port(adapter, i) {
                                port_bit = i ? i + 1 : 0;
-                               if (!(cause & (1 << port_bit))) continue;
+                               if (!(cause & (1 << port_bit)))
+                                       continue;
 
                                phy = adapter->port[i].phy;
                                phy_cause = phy->ops->interrupt_handler(phy);
index 85dc3b1dc3096a832b7fd987040236f19633a973..335544132ee3bfd48e1b534ea10022757d487887 100644 (file)
@@ -686,7 +686,8 @@ static struct cmac *vsc7326_mac_create(adapter_t *adapter, int index)
        int i;
 
        mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL);
-       if (!mac) return NULL;
+       if (!mac)
+               return NULL;
 
        mac->ops = &vsc7326_ops;
        mac->instance = (cmac_instance *)(mac + 1);
index c493e783d459d560834772adc752a2f11ab80a7d..f947cf6059b1ac1321639ad7e20a3f50bf4eb3cf 100644 (file)
@@ -347,7 +347,8 @@ static struct cphy* vsc8244_phy_create(adapter_t *adapter, int phy_addr, struct
 {
        struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);
 
-       if (!cphy) return NULL;
+       if (!cphy)
+               return NULL;
 
        cphy_init(cphy, adapter, phy_addr, &vsc8244_ops, mdio_ops);