Re: [net-next PATCH 1/4] netdev: replace simple napi_schedule_prep/__napi_schedule to napi_schedule

[Jakub Kicinski]

On Mon,  2 Oct 2023 17:10:20 +0200 Christian Marangi wrote:
>   queue_work(priv->xfer_wq, >rx_work);
> - else if (napi_schedule_prep(>napi))
> - __napi_schedule(>napi);
> + else
> + napi_schedule(>napi)

Missing semi-colon, please make sure each patch builds cleanly 
with allmodconfig.
-- 
pw-bot: cr

[net-next PATCH 1/4] netdev: replace simple napi_schedule_prep/__napi_schedule to napi_schedule

[Christian Marangi]

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 
---
 drivers/net/ethernet/ni/nixge.c | 3 +--
 drivers/net/ethernet/wiznet/w5100.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
index 97f4798f4b42..f71a4f8bbb89 100644
--- 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(>napi))
-   __napi_schedule(>napi);
+   napi_schedule(>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 341ee2f249fd..5613fd6a9f0a 100644
--- 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, >rx_work);
-   else if (napi_schedule_prep(>napi))
-   __napi_schedule(>napi);
+   else
+   napi_schedule(>napi)
}
 
return IRQ_HANDLED;
-- 
2.40.1