Skip to contentSkip to conversation

jme: remove an unnecessary indirection

PATCH Applied Jakub Kicinski 2 participants 2 messages May 4, 2022 – May 6, 2022

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 jme: remove an unnecessary indirection

Remove a define which looks like a OS abstraction layer and makes spatch conversions on this driver problematic.

---
CC: [email protected]

---
 drivers/net/ethernet/jme.c | 2 +-
 drivers/net/ethernet/jme.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/jme.c +1 -1
index b6c5122da995..f43d6616bc0d 100644
@@ -3009,7 +3009,7 @@ jme_init_one(struct pci_dev *pdev,
 		jwrite32(jme, JME_APMC, apmc);
 	}
 
-	NETIF_NAPI_SET(netdev, &jme->napi, jme_poll, NAPI_POLL_WEIGHT)
+	netif_napi_add(netdev, &jme->napi, jme_poll, NAPI_POLL_WEIGHT);
 
 	spin_lock_init(&jme->phy_lock);
 	spin_lock_init(&jme->macaddr_lock);
drivers/net/ethernet/jme.h +0 -2
index 2af76329b4a2..860494ff3714 100644
@@ -379,8 +379,6 @@ struct jme_ring {
 #define DECLARE_NET_DEVICE_STATS
 
 #define DECLARE_NAPI_STRUCT struct napi_struct napi;
-#define NETIF_NAPI_SET(dev, napis, pollfn, q) \
-	netif_napi_add(dev, napis, pollfn, q);
 #define JME_NAPI_HOLDER(holder) struct napi_struct *holder
 #define JME_NAPI_WEIGHT(w) int w
 #define JME_NAPI_WEIGHT_VAL(w) w
Signature · 1 line
2.34.1
#1 lore raw
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Wed, 4 May 2022 09:39:39 -0700 you wrote:

Remove a define which looks like a OS abstraction layer and makes spatch conversions on this driver problematic.

---
CC: [email protected]

[...]

Here is the summary with links:
- [net-next] jme: remove an unnecessary indirection

    https://git.kernel.org/netdev/net-next/c/fd49f8e61cd3

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html