can: can-dev: move to netif_napi_add_weight()

We want to remove the weight argument from the basic version of the
netif_napi_add() call. Move all the callers in drivers/net/can that
pass a custom weight (i.e. not NAPI_POLL_WEIGHT or 64) to the
netif_napi_add_weight() API.

Link: https://lore.kernel.org/all/20220517002345.1812104-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index a00655ccda0206150c31df335094e1b50f9214cb..953aef8d3978c906d69bc97a11eed056beae54df 100644 (file)
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1317,7 +1317,7 @@ static int at91_can_probe(struct platform_device *pdev)
        priv->pdata = dev_get_platdata(&pdev->dev);
        priv->mb0_id = 0x7ff;
 
-       netif_napi_add(dev, &priv->napi, at91_poll, get_mb_rx_num(priv));
+       netif_napi_add_weight(dev, &priv->napi, at91_poll, get_mb_rx_num(priv));
 
        if (at91_is_sam9263(priv))
                dev->sysfs_groups[0] = &at91_sysfs_attr_group;

diff --git a/drivers/net/can/c_can/c_can_main.c b/drivers/net/can/c_can/c_can_main.c
index faa217f267714248f6a59bbb33e3cd3c58099e8e..2034dbe3095858a06cafc1babe0f137573a9b34b 100644 (file)
--- a/drivers/net/can/c_can/c_can_main.c
+++ b/drivers/net/can/c_can/c_can_main.c
@@ -1246,7 +1246,8 @@ struct net_device *alloc_c_can_dev(int msg_obj_num)
        priv->tx.tail = 0;
        priv->tx.obj_num = msg_obj_tx_num;
 
-       netif_napi_add(dev, &priv->napi, c_can_poll, priv->msg_obj_rx_num);
+       netif_napi_add_weight(dev, &priv->napi, c_can_poll,
+                             priv->msg_obj_rx_num);
 
        priv->dev = dev;
        priv->can.bittiming_const = &c_can_bittiming_const;

diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c
index 6d0dc18c03e7070b948abe0b153f699bb74f05ad..509d21170c8cff8ca2722993cafb881fdbe2290a 100644 (file)
--- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/dev/rx-offload.c
@@ -337,7 +337,8 @@ static int can_rx_offload_init_queue(struct net_device *dev,
        skb_queue_head_init(&offload->skb_queue);
        __skb_queue_head_init(&offload->skb_irq_queue);
 
-       netif_napi_add(dev, &offload->napi, can_rx_offload_napi_poll, weight);
+       netif_napi_add_weight(dev, &offload->napi, can_rx_offload_napi_poll,
+                             weight);
 
        dev_dbg(dev->dev.parent, "%s: skb_queue_len_max=%d\n",
                __func__, offload->skb_queue_len_max);

diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 5215bd9b2c80d04bcdbcfd98d9b9aad164eb932f..76df4807d3666b3dc5abc332b29f33c29f1f0591 100644 (file)
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1609,7 +1609,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev,
                timer_setup(&priv->hang_timer, grcan_initiate_running_reset, 0);
        }
 
-       netif_napi_add(dev, &priv->napi, grcan_poll, GRCAN_NAPI_WEIGHT);
+       netif_napi_add_weight(dev, &priv->napi, grcan_poll, GRCAN_NAPI_WEIGHT);
 
        SET_NETDEV_DEV(dev, &ofdev->dev);
        dev_info(&ofdev->dev, "regs=0x%p, irq=%d, clock=%d\n",

diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 808c105cf8f7e005433dc0aeb3c17a80514f3374..35bfb82d69299af9f485959ee7cb167f0c4d69df 100644 (file)
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1910,7 +1910,7 @@ static int ican3_probe(struct platform_device *pdev)
        mod = netdev_priv(ndev);
        mod->ndev = ndev;
        mod->num = pdata->modno;
-       netif_napi_add(ndev, &mod->napi, ican3_napi, ICAN3_RX_BUFFERS);
+       netif_napi_add_weight(ndev, &mod->napi, ican3_napi, ICAN3_RX_BUFFERS);
        skb_queue_head_init(&mod->echoq);
        spin_lock_init(&mod->lock);
        init_completion(&mod->termination_comp);

diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 5b5802fac772596413ea869bfb39f7c9478011cc..78a21ab6360154387ae53ef3e8d335e463d235a0 100644 (file)
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -679,7 +679,7 @@ struct net_device *alloc_mscandev(void)
 
        dev->flags |= IFF_ECHO; /* we support local echo */
 
-       netif_napi_add(dev, &priv->napi, mscan_rx_poll, 8);
+       netif_napi_add_weight(dev, &priv->napi, mscan_rx_poll, 8);
 
        priv->can.bittiming_const = &mscan_bittiming_const;
        priv->can.do_set_bittiming = mscan_do_set_bittiming;

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 888bef03de09fd7b936b7d9b4adec15efaac35f2..fde3ac516d2642d5b50198aecfeb833164afc31a 100644 (file)
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1189,7 +1189,7 @@ static int pch_can_probe(struct pci_dev *pdev,
        ndev->netdev_ops = &pch_can_netdev_ops;
        priv->can.clock.freq = PCH_CAN_CLK; /* Hz */
 
-       netif_napi_add(ndev, &priv->napi, pch_can_poll, PCH_RX_OBJ_END);
+       netif_napi_add_weight(ndev, &priv->napi, pch_can_poll, PCH_RX_OBJ_END);
 
        rc = pci_enable_msi(priv->dev);
        if (rc) {

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index 33e37395379d7bb7a7e49bf503031719a228d2c4..103f1a92eee2f9f587e13bdb0ef87a1825ab9bdc 100644 (file)
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -803,8 +803,8 @@ static int rcar_can_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ndev);
        SET_NETDEV_DEV(ndev, &pdev->dev);
 
-       netif_napi_add(ndev, &priv->napi, rcar_can_rx_poll,
-                      RCAR_CAN_NAPI_WEIGHT);
+       netif_napi_add_weight(ndev, &priv->napi, rcar_can_rx_poll,
+                             RCAR_CAN_NAPI_WEIGHT);
        err = register_candev(ndev);
        if (err) {
                dev_err(&pdev->dev, "register_candev() failed, error %d\n",

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 1e121e04208cc67e347b3e884848092d6245d526..f75ebaa355199f3b02f75beb90ece8ff69639181 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -1789,8 +1789,8 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,
        priv->gpriv = gpriv;
        SET_NETDEV_DEV(ndev, &pdev->dev);
 
-       netif_napi_add(ndev, &priv->napi, rcar_canfd_rx_poll,
-                      RCANFD_NAPI_WEIGHT);
+       netif_napi_add_weight(ndev, &priv->napi, rcar_canfd_rx_poll,
+                             RCANFD_NAPI_WEIGHT);
        spin_lock_init(&priv->tx_lock);
        devm_can_led_init(ndev);
        gpriv->ch[priv->channel] = priv;

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 43f0c6a064ba1be53701c473dd5183f41a964b02..7f730b471e9fbcc0efe8b41de82a99f660a82d11 100644 (file)
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -1804,7 +1804,7 @@ static int xcan_probe(struct platform_device *pdev)
 
        priv->can.clock.freq = clk_get_rate(priv->can_clk);
 
-       netif_napi_add(ndev, &priv->napi, xcan_rx_poll, rx_max);
+       netif_napi_add_weight(ndev, &priv->napi, xcan_rx_poll, rx_max);
 
        ret = register_candev(ndev);
        if (ret) {