mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 07:01:57 +00:00
chelsio: useless curly braces
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
This commit is contained in:
parent
356bd1460d
commit
d7487421b6
@ -1292,9 +1292,8 @@ static int t1_clock(struct adapter *adapter, int mode)
|
|||||||
if (!t1_is_T1B(adapter))
|
if (!t1_is_T1B(adapter))
|
||||||
return -ENODEV; /* Can't re-clock this chip. */
|
return -ENODEV; /* Can't re-clock this chip. */
|
||||||
|
|
||||||
if (mode & 2) {
|
if (mode & 2)
|
||||||
return 0; /* show current mode. */
|
return 0; /* show current mode. */
|
||||||
}
|
|
||||||
|
|
||||||
if ((adapter->t1powersave & 1) == (mode & 1))
|
if ((adapter->t1powersave & 1) == (mode & 1))
|
||||||
return -EALREADY; /* ASIC already running in mode. */
|
return -EALREADY; /* ASIC already running in mode. */
|
||||||
|
@ -312,9 +312,9 @@ static int mv88e1xxx_interrupt_handler(struct cphy *cphy)
|
|||||||
(void) simple_mdio_read(cphy,
|
(void) simple_mdio_read(cphy,
|
||||||
MV88E1XXX_SPECIFIC_STATUS_REGISTER, &status);
|
MV88E1XXX_SPECIFIC_STATUS_REGISTER, &status);
|
||||||
|
|
||||||
if (status & MV88E1XXX_INTR_LINK_CHNG) {
|
if (status & MV88E1XXX_INTR_LINK_CHNG)
|
||||||
cphy->state |= PHY_LINK_UP;
|
cphy->state |= PHY_LINK_UP;
|
||||||
} else {
|
else {
|
||||||
cphy->state &= ~PHY_LINK_UP;
|
cphy->state &= ~PHY_LINK_UP;
|
||||||
if (cphy->state & PHY_AUTONEG_EN)
|
if (cphy->state & PHY_AUTONEG_EN)
|
||||||
cphy->state &= ~PHY_AUTONEG_RDY;
|
cphy->state &= ~PHY_AUTONEG_RDY;
|
||||||
|
@ -2195,9 +2195,8 @@ struct sge * __devinit t1_sge_create(struct adapter *adapter,
|
|||||||
if (adapter->params.nports > 1) {
|
if (adapter->params.nports > 1) {
|
||||||
tx_sched_init(sge);
|
tx_sched_init(sge);
|
||||||
sge->espibug_timer.function = espibug_workaround_t204;
|
sge->espibug_timer.function = espibug_workaround_t204;
|
||||||
} else {
|
} else
|
||||||
sge->espibug_timer.function = espibug_workaround;
|
sge->espibug_timer.function = espibug_workaround;
|
||||||
}
|
|
||||||
sge->espibug_timer.data = (unsigned long)sge->adapter;
|
sge->espibug_timer.data = (unsigned long)sge->adapter;
|
||||||
|
|
||||||
sge->espibug_timeout = 1;
|
sge->espibug_timeout = 1;
|
||||||
|
@ -226,9 +226,8 @@ static void run_table(adapter_t *adapter, struct init_table *ib, int len)
|
|||||||
if (ib[i].addr == INITBLOCK_SLEEP) {
|
if (ib[i].addr == INITBLOCK_SLEEP) {
|
||||||
udelay( ib[i].data );
|
udelay( ib[i].data );
|
||||||
CH_ERR("sleep %d us\n",ib[i].data);
|
CH_ERR("sleep %d us\n",ib[i].data);
|
||||||
} else {
|
} else
|
||||||
vsc_write( adapter, ib[i].addr, ib[i].data );
|
vsc_write( adapter, ib[i].addr, ib[i].data );
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user