UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ftgmac100: Remove useless tests in interrupt handler 

The interrupt is neither enabled nor registered when the interface
isn't running (regardless of whether we use nc-si or not) so the
test isn't useful.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Benjamin Herrenschmidt 2017-04-05 12:28:52 +10:00 committed by David S. Miller
parent 874b55bf62
commit 9b86785d1e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/faraday/ftgmac100.c
View File

@ -1049,14 +1049,9 @@ static irqreturn_t ftgmac100_interrupt(int irq, void *dev_id)
struct net_device *netdev = dev_id; struct net_device *netdev = dev_id;
struct ftgmac100 *priv = netdev_priv(netdev); struct ftgmac100 *priv = netdev_priv(netdev);
/* When running in NCSI mode, the interface should be ready for /* Disable interrupts for polling */
* receiving or transmitting NCSI packets before it's opened. iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
*/ napi_schedule(&priv->napi);
if (likely(priv->use_ncsi || netif_running(netdev))) {
/* Disable interrupts for polling */
iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
napi_schedule(&priv->napi);
}
return IRQ_HANDLED; return IRQ_HANDLED;
} }