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

diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index f66548751c38..4dad04e91f6d 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -428,7 +428,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget)
                         printk(KERN_WARNING "%s: rx: polling, but no queue\n",
                                priv->dev->name);
                 spin_unlock(&priv->rx_lock);
-                netif_rx_complete(napi);
+                napi_complete(napi);
                 return 0;
         }
 
@@ -514,7 +514,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget)
         if (processed == 0) {
                 /* we ran out of packets to read,
                  * revert to interrupt-driven mode */
-                netif_rx_complete(napi);
+                napi_complete(napi);
                 cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1);
                 return 0;
         }
@@ -536,7 +536,7 @@ fatal_error:
         }
 
         spin_unlock(&priv->rx_lock);
-        netif_rx_complete(napi);
+        napi_complete(napi);
         netif_tx_stop_all_queues(priv->dev);
         napi_disable(&priv->napi);
 
@@ -802,9 +802,9 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id)
 
         if (status & MAC_INT_RX) {
                 queue = (status >> 8) & 7;
-                if (netif_rx_schedule_prep(&priv->napi)) {
+                if (napi_schedule_prep(&priv->napi)) {
                         cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 1 << queue);
-                        __netif_rx_schedule(&priv->napi);
+                        __napi_schedule(&priv->napi);
                 }
         }