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/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index bb9094d4cbc9..c758884728a5 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1326,9 +1326,9 @@ static irqreturn_t atl1e_intr(int irq, void *data)
                         AT_WRITE_REG(hw, REG_IMR,
                                      IMR_NORMAL_MASK & ~ISR_RX_EVENT);
                         AT_WRITE_FLUSH(hw);
-                        if (likely(netif_rx_schedule_prep(
+                        if (likely(napi_schedule_prep(
                                    &adapter->napi)))
-                                __netif_rx_schedule(&adapter->napi);
+                                __napi_schedule(&adapter->napi);
                 }
         } while (--max_ints > 0);
         /* re-enable Interrupt*/
@@ -1514,7 +1514,7 @@ static int atl1e_clean(struct napi_struct *napi, int budget)
         /* If no Tx and not enough Rx work done, exit the polling mode */
         if (work_done < budget) {
 quit_polling:
-                netif_rx_complete(napi);
+                napi_complete(napi);
                 imr_data = AT_READ_REG(&adapter->hw, REG_IMR);
                 AT_WRITE_REG(&adapter->hw, REG_IMR, imr_data | ISR_RX_EVENT);
                 /* test debug */