diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-01-19 19:43:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:33:50 -0500 |
commit | 288379f050284087578b77e04f040b57db3db3f8 (patch) | |
tree | ac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/smsc9420.c | |
parent | 627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff) |
net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from
the NAPI functions named *netif_rx_* in commit 908a7a1, they are
exactly equivalent to the corresponding *napi_* functions and are
therefore redundant.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smsc9420.c')
-rw-r--r-- | drivers/net/smsc9420.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c index c14a4c6452c7..79f4c228b030 100644 --- a/drivers/net/smsc9420.c +++ b/drivers/net/smsc9420.c | |||
@@ -666,7 +666,7 @@ static irqreturn_t smsc9420_isr(int irq, void *dev_id) | |||
666 | smsc9420_pci_flush_write(pd); | 666 | smsc9420_pci_flush_write(pd); |
667 | 667 | ||
668 | ints_to_clear |= (DMAC_STS_RX_ | DMAC_STS_NIS_); | 668 | ints_to_clear |= (DMAC_STS_RX_ | DMAC_STS_NIS_); |
669 | netif_rx_schedule(&pd->napi); | 669 | napi_schedule(&pd->napi); |
670 | } | 670 | } |
671 | 671 | ||
672 | if (ints_to_clear) | 672 | if (ints_to_clear) |
@@ -889,7 +889,7 @@ static int smsc9420_rx_poll(struct napi_struct *napi, int budget) | |||
889 | smsc9420_pci_flush_write(pd); | 889 | smsc9420_pci_flush_write(pd); |
890 | 890 | ||
891 | if (work_done < budget) { | 891 | if (work_done < budget) { |
892 | netif_rx_complete(&pd->napi); | 892 | napi_complete(&pd->napi); |
893 | 893 | ||
894 | /* re-enable RX DMA interrupts */ | 894 | /* re-enable RX DMA interrupts */ |
895 | dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA); | 895 | dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA); |