diff options
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index a59edf7eacdc..601f93e482c6 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -1299,11 +1299,11 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id) | |||
1299 | 1299 | ||
1300 | /* If we are coalescing the interrupts, reset the timer */ | 1300 | /* If we are coalescing the interrupts, reset the timer */ |
1301 | /* Otherwise, clear it */ | 1301 | /* Otherwise, clear it */ |
1302 | if (priv->txcoalescing) | 1302 | if (likely(priv->txcoalescing)) { |
1303 | gfar_write(&priv->regs->txic, 0); | ||
1303 | gfar_write(&priv->regs->txic, | 1304 | gfar_write(&priv->regs->txic, |
1304 | mk_ic_value(priv->txcount, priv->txtime)); | 1305 | mk_ic_value(priv->txcount, priv->txtime)); |
1305 | else | 1306 | } |
1306 | gfar_write(&priv->regs->txic, 0); | ||
1307 | 1307 | ||
1308 | spin_unlock(&priv->txlock); | 1308 | spin_unlock(&priv->txlock); |
1309 | 1309 | ||
@@ -1417,11 +1417,11 @@ irqreturn_t gfar_receive(int irq, void *dev_id) | |||
1417 | 1417 | ||
1418 | /* If we are coalescing interrupts, update the timer */ | 1418 | /* If we are coalescing interrupts, update the timer */ |
1419 | /* Otherwise, clear it */ | 1419 | /* Otherwise, clear it */ |
1420 | if (priv->rxcoalescing) | 1420 | if (likely(priv->rxcoalescing)) { |
1421 | gfar_write(&priv->regs->rxic, 0); | ||
1421 | gfar_write(&priv->regs->rxic, | 1422 | gfar_write(&priv->regs->rxic, |
1422 | mk_ic_value(priv->rxcount, priv->rxtime)); | 1423 | mk_ic_value(priv->rxcount, priv->rxtime)); |
1423 | else | 1424 | } |
1424 | gfar_write(&priv->regs->rxic, 0); | ||
1425 | 1425 | ||
1426 | spin_unlock_irqrestore(&priv->rxlock, flags); | 1426 | spin_unlock_irqrestore(&priv->rxlock, flags); |
1427 | #endif | 1427 | #endif |
@@ -1593,11 +1593,11 @@ static int gfar_poll(struct napi_struct *napi, int budget) | |||
1593 | 1593 | ||
1594 | /* If we are coalescing interrupts, update the timer */ | 1594 | /* If we are coalescing interrupts, update the timer */ |
1595 | /* Otherwise, clear it */ | 1595 | /* Otherwise, clear it */ |
1596 | if (priv->rxcoalescing) | 1596 | if (likely(priv->rxcoalescing)) { |
1597 | gfar_write(&priv->regs->rxic, 0); | ||
1597 | gfar_write(&priv->regs->rxic, | 1598 | gfar_write(&priv->regs->rxic, |
1598 | mk_ic_value(priv->rxcount, priv->rxtime)); | 1599 | mk_ic_value(priv->rxcount, priv->rxtime)); |
1599 | else | 1600 | } |
1600 | gfar_write(&priv->regs->rxic, 0); | ||
1601 | } | 1601 | } |
1602 | 1602 | ||
1603 | return howmany; | 1603 | return howmany; |