netdev: replace simple napi_schedule_prep/__napi_schedule to napi_schedule

Replace drivers that still use napi_schedule_prep/__napi_schedule
with napi_schedule helper as it does the same exact check and call.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20231009133754.9834-1-ansuelsmth@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
index 97f4798f4b427be8dc219dc4cc94063d3b3faa75..f71a4f8bbb89e6aafb8fd60c958322ba0a3c56fe 100644 (file)
--- a/drivers/net/ethernet/ni/nixge.c
+++ b/drivers/net/ethernet/ni/nixge.c
@@ -755,8 +755,7 @@ static irqreturn_t nixge_rx_irq(int irq, void *_ndev)
                cr &= ~(XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK);
                nixge_dma_write_reg(priv, XAXIDMA_RX_CR_OFFSET, cr);
 
-               if (napi_schedule_prep(&priv->napi))
-                       __napi_schedule(&priv->napi);
+               napi_schedule(&priv->napi);
                goto out;
        }
        if (!(status & XAXIDMA_IRQ_ALL_MASK)) {

diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 341ee2f249fda188f73be1ab01b2c71520b026b3..b26fd15c25aece61818523bc870f9f5c7d6e56d5 100644 (file)
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -930,8 +930,8 @@ static irqreturn_t w5100_interrupt(int irq, void *ndev_instance)
 
                if (priv->ops->may_sleep)
                        queue_work(priv->xfer_wq, &priv->rx_work);
-               else if (napi_schedule_prep(&priv->napi))
-                       __napi_schedule(&priv->napi);
+               else
+                       napi_schedule(&priv->napi);
        }
 
        return IRQ_HANDLED;