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>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 7709992bb6bf..cb9c95d3ed0a 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -831,7 +831,7 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
         if (rx_pkt_limit > 0) {
                 /* Receive descriptor is empty now */
                 spin_lock_irqsave(&lp->lock, flags);
-                __netif_rx_complete(napi);
+                __napi_complete(napi);
                 writel(VAL0|RINTEN0, mmio + INTEN0);
                 writel(VAL2 | RDMD0, mmio + CMD0);
                 spin_unlock_irqrestore(&lp->lock, flags);
@@ -1170,11 +1170,11 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)
 
         /* Check if Receive Interrupt has occurred. */
         if (intr0 & RINT0) {
-                if (netif_rx_schedule_prep(&lp->napi)) {
+                if (napi_schedule_prep(&lp->napi)) {
                         /* Disable receive interupts */
                         writel(RINTEN0, mmio + INTEN0);
                         /* Schedule a polling routine */
-                        __netif_rx_schedule(&lp->napi);
+                        __napi_schedule(&lp->napi);
                 } else if (intren0 & RINTEN0) {
                         printk("************Driver bug! \
                                 interrupt while in poll\n");