diff options
Diffstat (limited to 'drivers/net/chelsio')
-rw-r--r-- | drivers/net/chelsio/cxgb2.c | 3 | ||||
-rw-r--r-- | drivers/net/chelsio/mv88e1xxx.c | 4 | ||||
-rw-r--r-- | drivers/net/chelsio/sge.c | 3 | ||||
-rw-r--r-- | drivers/net/chelsio/vsc7326.c | 3 |
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) | |||
1292 | if (!t1_is_T1B(adapter)) | 1292 | if (!t1_is_T1B(adapter)) |
1293 | return -ENODEV; /* Can't re-clock this chip. */ | 1293 | return -ENODEV; /* Can't re-clock this chip. */ |
1294 | 1294 | ||
1295 | if (mode & 2) { | 1295 | if (mode & 2) |
1296 | return 0; /* show current mode. */ | 1296 | return 0; /* show current mode. */ |
1297 | } | ||
1298 | 1297 | ||
1299 | if ((adapter->t1powersave & 1) == (mode & 1)) | 1298 | if ((adapter->t1powersave & 1) == (mode & 1)) |
1300 | return -EALREADY; /* ASIC already running in mode. */ | 1299 | 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) | |||
312 | (void) simple_mdio_read(cphy, | 312 | (void) simple_mdio_read(cphy, |
313 | MV88E1XXX_SPECIFIC_STATUS_REGISTER, &status); | 313 | MV88E1XXX_SPECIFIC_STATUS_REGISTER, &status); |
314 | 314 | ||
315 | if (status & MV88E1XXX_INTR_LINK_CHNG) { | 315 | if (status & MV88E1XXX_INTR_LINK_CHNG) |
316 | cphy->state |= PHY_LINK_UP; | 316 | cphy->state |= PHY_LINK_UP; |
317 | } else { | 317 | else { |
318 | cphy->state &= ~PHY_LINK_UP; | 318 | cphy->state &= ~PHY_LINK_UP; |
319 | if (cphy->state & PHY_AUTONEG_EN) | 319 | if (cphy->state & PHY_AUTONEG_EN) |
320 | cphy->state &= ~PHY_AUTONEG_RDY; | 320 | 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, | |||
2195 | if (adapter->params.nports > 1) { | 2195 | if (adapter->params.nports > 1) { |
2196 | tx_sched_init(sge); | 2196 | tx_sched_init(sge); |
2197 | sge->espibug_timer.function = espibug_workaround_t204; | 2197 | sge->espibug_timer.function = espibug_workaround_t204; |
2198 | } else { | 2198 | } else |
2199 | sge->espibug_timer.function = espibug_workaround; | 2199 | sge->espibug_timer.function = espibug_workaround; |
2200 | } | ||
2201 | sge->espibug_timer.data = (unsigned long)sge->adapter; | 2200 | sge->espibug_timer.data = (unsigned long)sge->adapter; |
2202 | 2201 | ||
2203 | sge->espibug_timeout = 1; | 2202 | 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) | |||
226 | if (ib[i].addr == INITBLOCK_SLEEP) { | 226 | if (ib[i].addr == INITBLOCK_SLEEP) { |
227 | udelay( ib[i].data ); | 227 | udelay( ib[i].data ); |
228 | CH_ERR("sleep %d us\n",ib[i].data); | 228 | CH_ERR("sleep %d us\n",ib[i].data); |
229 | } else { | 229 | } else |
230 | vsc_write( adapter, ib[i].addr, ib[i].data ); | 230 | vsc_write( adapter, ib[i].addr, ib[i].data ); |
231 | } | ||
232 | } | 231 | } |
233 | } | 232 | } |
234 | 233 | ||