linux-kernel - [net-next v3 1/5] netdev: replace simple napi_schedule_prep/__napi_schedule to napi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20231009133754.9834-1-ansuelsmth@gmail.com>
Date:   Mon,  9 Oct 2023 15:37:50 +0200
From:   Christian Marangi <ansuelsmth@...il.com>
To:     Jason Gunthorpe <jgg@...pe.ca>, Leon Romanovsky <leon@...nel.org>,
        Wolfgang Grandegger <wg@...ndegger.com>,
        Marc Kleine-Budde <mkl@...gutronix.de>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Chris Snook <chris.snook@...il.com>,
        Raju Rangoju <rajur@...lsio.com>,
        Jeroen de Borst <jeroendb@...gle.com>,
        Praveen Kaligineedi <pkaligineedi@...gle.com>,
        Shailend Chand <shailend@...gle.com>,
        Douglas Miller <dougmill@...ux.ibm.com>,
        Nick Child <nnac123@...ux.ibm.com>,
        Michael Ellerman <mpe@...erman.id.au>,
        Nicholas Piggin <npiggin@...il.com>,
        Christophe Leroy <christophe.leroy@...roup.eu>,
        Haren Myneni <haren@...ux.ibm.com>,
        Rick Lindsley <ricklind@...ux.ibm.com>,
        Dany Madden <danymadden@...ibm.com>,
        Thomas Falcon <tlfalcon@...ux.ibm.com>,
        Tariq Toukan <tariqt@...dia.com>,
        Alexandre Torgue <alexandre.torgue@...s.st.com>,
        Jose Abreu <joabreu@...opsys.com>,
        Maxime Coquelin <mcoquelin.stm32@...il.com>,
        Krzysztof Halasa <khalasa@...p.pl>,
        Kalle Valo <kvalo@...nel.org>,
        Jeff Johnson <quic_jjohnson@...cinc.com>,
        Gregory Greenman <gregory.greenman@...el.com>,
        Chandrashekar Devegowda <chandrashekar.devegowda@...el.com>,
        Intel Corporation <linuxwwan@...el.com>,
        Chiranjeevi Rapolu <chiranjeevi.rapolu@...ux.intel.com>,
        Liu Haijun <haijun.liu@...iatek.com>,
        M Chetan Kumar <m.chetan.kumar@...ux.intel.com>,
        Ricardo Martinez <ricardo.martinez@...ux.intel.com>,
        Loic Poulain <loic.poulain@...aro.org>,
        Sergey Ryazanov <ryazanov.s.a@...il.com>,
        Johannes Berg <johannes@...solutions.net>,
        Christian Marangi <ansuelsmth@...il.com>,
        Yuanjun Gong <ruc_gongyuanjun@....com>,
        Alex Elder <elder@...aro.org>,
        Bhupesh Sharma <bhupesh.sharma@...aro.org>,
        Simon Horman <horms@...nel.org>, Rob Herring <robh@...nel.org>,
        Bailey Forrest <bcf@...gle.com>,
        Junfeng Guo <junfeng.guo@...el.com>,
        "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        Ziwei Xiao <ziweixiao@...gle.com>,
        Rushil Gupta <rushilg@...gle.com>,
        Thomas Gleixner <tglx@...utronix.de>,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>,
        Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
        Yuri Karpov <YKarpov@...ras.ru>, Andrew Lunn <andrew@...n.ch>,
        Zheng Zengkai <zhengzengkai@...wei.com>,
        Dawei Li <set_pte_at@...look.com>,
        Anjaneyulu <pagadala.yesu.anjaneyulu@...el.com>,
        Benjamin Berg <benjamin.berg@...el.com>,
        linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-can@...r.kernel.org, netdev@...r.kernel.org,
        linuxppc-dev@...ts.ozlabs.org,
        linux-stm32@...md-mailman.stormreply.com,
        linux-arm-kernel@...ts.infradead.org, ath10k@...ts.infradead.org,
        linux-wireless@...r.kernel.org
Subject: [net-next v3 1/5] 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@...il.com>
Reviewed-by: Eric Dumazet <edumazet@...gle.com>
---
Changes v3:
- Add Reviewed-by tag
Changes v2:
- Add missing semicolon
---
 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(&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 341ee2f249fd..b26fd15c25ae 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, &priv->rx_work);
-		else if (napi_schedule_prep(&priv->napi))
-			__napi_schedule(&priv->napi);
+		else
+			napi_schedule(&priv->napi);
 	}
 
 	return IRQ_HANDLED;
-- 
2.40.1