eth: cpsw: 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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index e6ad2e53f1cd9c10bbcab998414500e5c0640e4a..662435e36805a87061242ddbdbc2069b29ae5e6c 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1639,10 +1639,10 @@ static int cpsw_probe(struct platform_device *pdev)
        ndev->ethtool_ops = &cpsw_ethtool_ops;
        netif_napi_add(ndev, &cpsw->napi_rx,
                       cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll,
-                      CPSW_POLL_WEIGHT);
+                      NAPI_POLL_WEIGHT);
        netif_tx_napi_add(ndev, &cpsw->napi_tx,
                          cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll,
-                         CPSW_POLL_WEIGHT);
+                         NAPI_POLL_WEIGHT);
 
        /* register the network device */
        SET_NETDEV_DEV(ndev, dev);

diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c
index 0f31cb4168bbcd5369679b0ff1d5a919639d4a46..b33781ed760eff479e6be6f93157a1abda8cbed7 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -1416,11 +1416,11 @@ static int cpsw_create_ports(struct cpsw_common *cpsw)
                        netif_napi_add(ndev, &cpsw->napi_rx,
                                       cpsw->quirk_irq ?
                                       cpsw_rx_poll : cpsw_rx_mq_poll,
-                                      CPSW_POLL_WEIGHT);
+                                      NAPI_POLL_WEIGHT);
                        netif_tx_napi_add(ndev, &cpsw->napi_tx,
                                          cpsw->quirk_irq ?
                                          cpsw_tx_poll : cpsw_tx_mq_poll,
-                                         CPSW_POLL_WEIGHT);
+                                         NAPI_POLL_WEIGHT);
                }
 
                napi_ndev = ndev;

diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c
index 887285c57db83a6f15df9e1a6fd3d6d36e3fc3ef..758295c898ac9b87959b5f2f3f84bd77ee0b9301 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_priv.c
+++ b/drivers/net/ethernet/ti/cpsw_priv.c
@@ -364,7 +364,7 @@ void cpsw_split_res(struct cpsw_common *cpsw)
        if (cpsw->tx_ch_num == rlim_ch_num) {
                max_rate = consumed_rate;
        } else if (!rlim_ch_num) {
-               ch_budget = CPSW_POLL_WEIGHT / cpsw->tx_ch_num;
+               ch_budget = NAPI_POLL_WEIGHT / cpsw->tx_ch_num;
                bigest_rate = 0;
                max_rate = consumed_rate;
        } else {
@@ -379,19 +379,19 @@ void cpsw_split_res(struct cpsw_common *cpsw)
                if (max_rate < consumed_rate)
                        max_rate *= 10;
 
-               ch_budget = (consumed_rate * CPSW_POLL_WEIGHT) / max_rate;
-               ch_budget = (CPSW_POLL_WEIGHT - ch_budget) /
+               ch_budget = (consumed_rate * NAPI_POLL_WEIGHT) / max_rate;
+               ch_budget = (NAPI_POLL_WEIGHT - ch_budget) /
                            (cpsw->tx_ch_num - rlim_ch_num);
                bigest_rate = (max_rate - consumed_rate) /
                              (cpsw->tx_ch_num - rlim_ch_num);
        }
 
        /* split tx weight/budget */
-       budget = CPSW_POLL_WEIGHT;
+       budget = NAPI_POLL_WEIGHT;
        for (i = 0; i < cpsw->tx_ch_num; i++) {
                ch_rate = cpdma_chan_get_rate(txv[i].ch);
                if (ch_rate) {
-                       txv[i].budget = (ch_rate * CPSW_POLL_WEIGHT) / max_rate;
+                       txv[i].budget = (ch_rate * NAPI_POLL_WEIGHT) / max_rate;
                        if (!txv[i].budget)
                                txv[i].budget++;
                        if (ch_rate > bigest_rate) {
@@ -417,7 +417,7 @@ void cpsw_split_res(struct cpsw_common *cpsw)
                txv[bigest_rate_ch].budget += budget;
 
        /* split rx budget */
-       budget = CPSW_POLL_WEIGHT;
+       budget = NAPI_POLL_WEIGHT;
        ch_budget = budget / cpsw->rx_ch_num;
        for (i = 0; i < cpsw->rx_ch_num; i++) {
                cpsw->rxv[i].budget = ch_budget;

diff --git a/drivers/net/ethernet/ti/cpsw_priv.h b/drivers/net/ethernet/ti/cpsw_priv.h
index fc591f5ebe18dfbeefa3728a8f7683adb59fc46e..34230145ca0b5012afc567f887df6317219dbda7 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_priv.h
+++ b/drivers/net/ethernet/ti/cpsw_priv.h
@@ -89,7 +89,6 @@ do {                                                          \
 #define CPDMA_TXCP             0x40
 #define CPDMA_RXCP             0x60
 
-#define CPSW_POLL_WEIGHT       64
 #define CPSW_RX_VLAN_ENCAP_HDR_SIZE            4
 #define CPSW_MIN_PACKET_SIZE_VLAN      (VLAN_ETH_ZLEN)
 #define CPSW_MIN_PACKET_SIZE   (ETH_ZLEN)