diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-04-05 12:28:52 +1000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-06 12:38:04 -0700 |
| commit | 9b86785d1e8b2a971c0ac77a76fb49d78db50916 (patch) | |
| tree | 87f4c97c01709eb15202a6477ecc1d001ffecea5 /drivers/net/ethernet/faraday | |
| parent | 874b55bf62330ca215758845d8abe93d139f874a (diff) | |
| download | linux-9b86785d1e8b2a971c0ac77a76fb49d78db50916.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/ethernet/faraday')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 2c08bacd066c..6625012d734e 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1049,14 +1049,9 @@ static irqreturn_t ftgmac100_interrupt(int irq, void *dev_id) struct net_device *netdev = dev_id; struct ftgmac100 *priv = netdev_priv(netdev); - /* When running in NCSI mode, the interface should be ready for - * receiving or transmitting NCSI packets before it's opened. - */ - if (likely(priv->use_ncsi || netif_running(netdev))) { - /* Disable interrupts for polling */ - iowrite32(0, priv->base + FTGMAC100_OFFSET_IER); - napi_schedule(&priv->napi); - } + /* Disable interrupts for polling */ + iowrite32(0, priv->base + FTGMAC100_OFFSET_IER); + napi_schedule(&priv->napi); return IRQ_HANDLED; } |