Commit ef724517 authored by Christian Marangi's avatar Christian Marangi Committed by Jakub Kicinski
Browse files

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: default avatarChristian Marangi <ansuelsmth@gmail.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20231009133754.9834-1-ansuelsmth@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 460c81da

drivers/net/ethernet/ni/nixge.c

+1 −2
Original line number Diff line number Diff line
@@ -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)) {

drivers/net/ethernet/wiznet/w5100.c

+2 −2
Original line number Diff line number Diff line
@@ -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;