From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 28 Apr 2022 14:23:23 -0700
Subject: qeth: remove a copy of the NAPI_POLL_WEIGHT define
Git-commit: 4bb0c7f09a1962330e9edf5dd6cfe44113aeee45
Patch-mainline: v5.19-rc1
References: jsc#PED-594 LTC#198619
Defining local versions of NAPI_POLL_WEIGHT with the same
values in the drivers just makes refactoring harder.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/s390/net/qeth_core.h | 2 --
drivers/s390/net/qeth_core_main.c | 2 +-
drivers/s390/net/qeth_l2_main.c | 2 +-
drivers/s390/net/qeth_l3_main.c | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -819,8 +819,6 @@ struct qeth_priv {
u32 brport_features;
};
-#define QETH_NAPI_WEIGHT NAPI_POLL_WEIGHT
-
struct qeth_card {
enum qeth_card_states state;
spinlock_t lock;
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -7189,7 +7189,7 @@ int qeth_open(struct net_device *dev)
local_bh_disable();
qeth_for_each_output_queue(card, queue, i) {
netif_tx_napi_add(dev, &queue->napi, qeth_tx_poll,
- QETH_NAPI_WEIGHT);
+ NAPI_POLL_WEIGHT);
napi_enable(&queue->napi);
napi_schedule(&queue->napi);
}
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1192,7 +1192,7 @@ static int qeth_l2_setup_netdev(struct q
}
add_napi:
- netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT);
+ netif_napi_add(card->dev, &card->napi, qeth_poll, NAPI_POLL_WEIGHT);
return register_netdev(card->dev);
}
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1910,7 +1910,7 @@ static int qeth_l3_setup_netdev(struct q
netif_set_gso_max_size(card->dev,
PAGE_SIZE * (QETH_MAX_BUFFER_ELEMENTS(card) - 1));
- netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT);
+ netif_napi_add(card->dev, &card->napi, qeth_poll, NAPI_POLL_WEIGHT);
return register_netdev(card->dev);
}