qeth: remove a copy of the NAPI_POLL_WEIGHT define

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>

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index de25d7ac41da8d02a4496be990a94fedbf7a52fd..1d195429753dd590ac90d82217d9994f0bc49607 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -801,8 +801,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;

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index d99c5b773e228570b9134e5c0ce6e3e8053f2cc2..ae85179ca49a1ed174ff2926f5d23ffad28be935 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -7100,7 +7100,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);
        }

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 303461d70af39c8b8936730ab92e5281a112dcbb..92698f79a4e0d00794dda7cb568a2ddb251c7553 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1133,7 +1133,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
                                       PAGE_SIZE * (QDIO_MAX_ELEMENTS_PER_BUFFER - 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);
 }
 

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index d2f422a9a4f7a3ad9cfb08d18ec04f54209ab670..ea3b6b18aa6e067d3860809e32ad115c08f5484b 100644 (file)
--- 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 qeth_card *card)
                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);
 }