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, 4 insertions, 4 deletions

diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 3ec20cc18b0c..cc7708775da0 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -298,7 +298,7 @@ poll_some_more:
                 int more = 0;
 
                 spin_lock_irq(&ep->rx_lock);
-                __netif_rx_complete(napi);
+                __napi_complete(napi);
                 wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX);
                 if (ep93xx_have_more_rx(ep)) {
                         wrl(ep, REG_INTEN, REG_INTEN_TX);
@@ -307,7 +307,7 @@ poll_some_more:
                 }
                 spin_unlock_irq(&ep->rx_lock);
 
-                if (more && netif_rx_reschedule(napi))
+                if (more && napi_reschedule(napi))
                         goto poll_some_more;
         }
 
@@ -415,9 +415,9 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id)
 
         if (status & REG_INTSTS_RX) {
                 spin_lock(&ep->rx_lock);
-                if (likely(netif_rx_schedule_prep(&ep->napi))) {
+                if (likely(napi_schedule_prep(&ep->napi))) {
                         wrl(ep, REG_INTEN, REG_INTEN_TX);
-                        __netif_rx_schedule(&ep->napi);
+                        __napi_schedule(&ep->napi);
                 }
                 spin_unlock(&ep->rx_lock);
         }