mt76: switch to netif_napi_add_tx()

Switch to the new API not requiring passing in NAPI_POLL_WEIGHT.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220504163316.549648-3-kuba@kernel.org

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index 37b092e..2c1c79d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -223,8 +223,8 @@ int mt7603_dma_init(struct mt7603_dev *dev)
        if (ret)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
-                         mt7603_poll_tx, NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
+                         mt7603_poll_tx);
        napi_enable(&dev->mt76.tx_napi);
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
index 00aefea..95dbb41 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
@@ -284,8 +284,8 @@ int mt7615_dma_init(struct mt7615_dev *dev)
        if (ret < 0)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
-                         mt7615_poll_tx, NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
+                         mt7615_poll_tx);
        napi_enable(&dev->mt76.tx_napi);
 
        mt76_poll(dev, MT_WPDMA_GLO_CFG,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 8bcd8af..23d2864 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -230,8 +230,8 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)
        if (ret)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
-                         mt76x02_poll_tx, NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
+                         mt76x02_poll_tx);
        napi_enable(&dev->mt76.tx_napi);
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
index 49b4d8a..75678aa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
@@ -434,8 +434,8 @@ int mt7915_dma_init(struct mt7915_dev *dev)
        if (ret < 0)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
-                         mt7915_poll_tx, NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
+                         mt7915_poll_tx);
        napi_enable(&dev->mt76.tx_napi);
 
        mt7915_dma_enable(dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
index ca7e20f..34b3eff 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
@@ -296,8 +296,8 @@ int mt7921_dma_init(struct mt7921_dev *dev)
        if (ret < 0)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
-                         mt7921_poll_tx, NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
+                         mt7921_poll_tx);
        napi_enable(&dev->mt76.tx_napi);
 
        return mt7921_dma_enable(dev);