summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2006-12-11 23:49:13 +0100
committerJeff Garzik <jeff@garzik.org>2007-02-05 16:58:43 -0500
commitd7487421b629c5ca71ce23b10461ef0c3ad2c741 (patch)
tree74266cf994c43ff84b7c3bd713213485d0f998aa
parent356bd1460d1e1c4e433e4114fdac02139bddf17c (diff)
downloadlinux-d7487421b629c5ca71ce23b10461ef0c3ad2c741.tar.gz
linux-d7487421b629c5ca71ce23b10461ef0c3ad2c741.tar.bz2
linux-d7487421b629c5ca71ce23b10461ef0c3ad2c741.zip
chelsio: useless curly braces
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
-rw-r--r--drivers/net/chelsio/cxgb2.c3
-rw-r--r--drivers/net/chelsio/mv88e1xxx.c4
-rw-r--r--drivers/net/chelsio/sge.c3
-rw-r--r--drivers/net/chelsio/vsc7326.c3
4 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index bb11b111335b..689b91c77465 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -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. */
diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/chelsio/mv88e1xxx.c
index c7c5854715be..5867e3b0a887 100644
--- a/drivers/net/chelsio/mv88e1xxx.c
+++ b/drivers/net/chelsio/mv88e1xxx.c
@@ -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;
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 6b1e857ee07e..ac7c46b0eeb4 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -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;
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/chelsio/vsc7326.c
index bdd25c0b8458..31a67f522597 100644
--- a/drivers/net/chelsio/vsc7326.c
+++ b/drivers/net/chelsio/vsc7326.c
@@ -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 );
- }
}
}