Commit caf6b7f8 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Marc Kleine-Budde
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent b76b163f

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/can/c_can/c_can_main.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/can/dev/rx-offload.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/can/grcan.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

drivers/net/can/janz-ican3.c

+1 −1
Original line number Diff line number Diff line
@@ -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);