]> err.no Git - linux-2.6/commitdiff
chelsio: useless curly braces
authorFrancois Romieu <romieu@fr.zoreil.com>
Mon, 11 Dec 2006 22:49:13 +0000 (23:49 +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/cxgb2.c
drivers/net/chelsio/mv88e1xxx.c
drivers/net/chelsio/sge.c
drivers/net/chelsio/vsc7326.c

index bb11b111335b3ddaa4e5921b308d176a2953db23..689b91c7746516e222854c86a0905fc0af1e0d22 100644 (file)
@@ -1292,9 +1292,8 @@ static int t1_clock(struct adapter *adapter, int mode)
        if (!t1_is_T1B(adapter))
                return -ENODEV; /* Can't re-clock this chip. */
 
-       if (mode & 2) {
+       if (mode & 2)
                return 0;       /* show current mode. */
-       }
 
        if ((adapter->t1powersave & 1) == (mode & 1))
                return -EALREADY;       /* ASIC already running in mode. */
index c7c5854715be1c13bba5a5cb86b4363d73e8f38b..5867e3b0a887fbf9496fb496ea11a494c8fb38cf 100644 (file)
@@ -312,9 +312,9 @@ static int mv88e1xxx_interrupt_handler(struct cphy *cphy)
                        (void) simple_mdio_read(cphy,
                                MV88E1XXX_SPECIFIC_STATUS_REGISTER, &status);
 
-                       if (status & MV88E1XXX_INTR_LINK_CHNG) {
+                       if (status & MV88E1XXX_INTR_LINK_CHNG)
                                cphy->state |= PHY_LINK_UP;
-                       else {
+                       else {
                                cphy->state &= ~PHY_LINK_UP;
                                if (cphy->state & PHY_AUTONEG_EN)
                                        cphy->state &= ~PHY_AUTONEG_RDY;
index 6b1e857ee07eb63c84d470c075849bc6bf83df7a..ac7c46b0eeb4c9c33fdf86554b82b9d6ef7ca42e 100644 (file)
@@ -2195,9 +2195,8 @@ struct sge * __devinit t1_sge_create(struct adapter *adapter,
                if (adapter->params.nports > 1) {
                        tx_sched_init(sge);
                        sge->espibug_timer.function = espibug_workaround_t204;
-               } else {
+               } else
                        sge->espibug_timer.function = espibug_workaround;
-               }
                sge->espibug_timer.data = (unsigned long)sge->adapter;
 
                sge->espibug_timeout = 1;
index bdd25c0b84587f91cca1ff30dd6664b8abc9f71a..31a67f522597ed225fb10be0c03f1b19b7b8149b 100644 (file)
@@ -226,9 +226,8 @@ static void run_table(adapter_t *adapter, struct init_table *ib, int len)
                if (ib[i].addr == INITBLOCK_SLEEP) {
                        udelay( ib[i].data );
                        CH_ERR("sleep %d us\n",ib[i].data);
-               } else {
+               } else
                        vsc_write( adapter, ib[i].addr, ib[i].data );
-               }
        }
 }