[PATCH net-next] eth: sfc: remove remnants of the out-of-tree napi_weight module param

[PATCH net-next] eth: sfc: remove remnants of the out-of-tree napi_weight module param

[Jakub Kicinski]

Remove napi_weight statics which are set to 64 and never modified,
remnants of the out-of-tree napi_weight module param.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: ecree.xilinx@gmail.com
CC: habetsm.xilinx@gmail.com
CC: hkallweit1@gmail.com
CC: ihuguet@redhat.com
---
 drivers/net/ethernet/sfc/efx_channels.c       | 8 +-------
 drivers/net/ethernet/sfc/falcon/efx.c         | 8 +-------
 drivers/net/ethernet/sfc/siena/efx_channels.c | 8 +-------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c
index 3f28f9861dfa..8c00e05e7650 100644
--- a/drivers/net/ethernet/sfc/efx_channels.c
+++ b/drivers/net/ethernet/sfc/efx_channels.c
@@ -46,11 +46,6 @@ module_param(irq_adapt_high_thresh, uint, 0644);
 MODULE_PARM_DESC(irq_adapt_high_thresh,
 		 "Threshold score for increasing IRQ moderation");
 
-/* This is the weight assigned to each of the (per-channel) virtual
- * NAPI devices.
- */
-static int napi_weight = 64;
-
 static const struct efx_channel_type efx_default_channel_type;
 
 /*************
@@ -1316,8 +1311,7 @@ void efx_init_napi_channel(struct efx_channel *channel)
 	struct efx_nic *efx = channel->efx;
 
 	channel->napi_dev = efx->net_dev;
-	netif_napi_add_weight(channel->napi_dev, &channel->napi_str, efx_poll,
-			      napi_weight);
+	netif_napi_add(channel->napi_dev, &channel->napi_str, efx_poll, 64);
 }
 
 void efx_init_napi(struct efx_nic *efx)
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index f619ffb26787..a63f40b09856 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -112,11 +112,6 @@ module_param(ef4_separate_tx_channels, bool, 0444);
 MODULE_PARM_DESC(ef4_separate_tx_channels,
 		 "Use separate channels for TX and RX");
 
-/* This is the weight assigned to each of the (per-channel) virtual
- * NAPI devices.
- */
-static int napi_weight = 64;
-
 /* This is the time (in jiffies) between invocations of the hardware
  * monitor.
  * On Falcon-based NICs, this will:
@@ -2017,8 +2012,7 @@ static void ef4_init_napi_channel(struct ef4_channel *channel)
 	struct ef4_nic *efx = channel->efx;
 
 	channel->napi_dev = efx->net_dev;
-	netif_napi_add_weight(channel->napi_dev, &channel->napi_str, ef4_poll,
-			      napi_weight);
+	netif_napi_add(channel->napi_dev, &channel->napi_str, ef4_poll, 64);
 }
 
 static void ef4_init_napi(struct ef4_nic *efx)
diff --git a/drivers/net/ethernet/sfc/siena/efx_channels.c b/drivers/net/ethernet/sfc/siena/efx_channels.c
index 276cd7d88732..3e1468c81ba2 100644
--- a/drivers/net/ethernet/sfc/siena/efx_channels.c
+++ b/drivers/net/ethernet/sfc/siena/efx_channels.c
@@ -46,11 +46,6 @@ module_param(irq_adapt_high_thresh, uint, 0644);
 MODULE_PARM_DESC(irq_adapt_high_thresh,
 		 "Threshold score for increasing IRQ moderation");
 
-/* This is the weight assigned to each of the (per-channel) virtual
- * NAPI devices.
- */
-static int napi_weight = 64;
-
 static const struct efx_channel_type efx_default_channel_type;
 
 /*************
@@ -1324,8 +1319,7 @@ static void efx_init_napi_channel(struct efx_channel *channel)
 	struct efx_nic *efx = channel->efx;
 
 	channel->napi_dev = efx->net_dev;
-	netif_napi_add_weight(channel->napi_dev, &channel->napi_str, efx_poll,
-			      napi_weight);
+	netif_napi_add(channel->napi_dev, &channel->napi_str, efx_poll, 64);
 }
 
 void efx_siena_init_napi(struct efx_nic *efx)
-- 
2.34.3

Re: [PATCH net-next] eth: sfc: remove remnants of the out-of-tree napi_weight module param

[Edward Cree]

On 12/05/2022 21:56, Jakub Kicinski wrote:
> Remove napi_weight statics which are set to 64 and never modified,
> remnants of the out-of-tree napi_weight module param.
> 
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---

Acked-by: Edward Cree <ecree.xilinx@gmail.com>

Re: [PATCH net-next] eth: sfc: remove remnants of the out-of-tree napi_weight module param

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 12 May 2022 13:56:03 -0700 you wrote:
> Remove napi_weight statics which are set to 64 and never modified,
> remnants of the out-of-tree napi_weight module param.
> 
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: ecree.xilinx@gmail.com
> CC: habetsm.xilinx@gmail.com
> CC: hkallweit1@gmail.com
> CC: ihuguet@redhat.com
> 
> [...]

Here is the summary with links:
  - [net-next] eth: sfc: remove remnants of the out-of-tree napi_weight module param
    https://git.kernel.org/netdev/net-next/c/c28678162b33

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html