Commit 5f012b40 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

eth: remove copies of the NAPI_POLL_WEIGHT define 



Defining local versions of NAPI_POLL_WEIGHT with the same
values in the drivers just makes refactoring harder.

Drop the special defines in a bunch of drivers where the
removal is relatively simple so grouping into one patch
does not impact reviewability.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5da66099

drivers/net/ethernet/cortina/gemini.c

+1 −3
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); 
#define DEFAULT_GMAC_RXQ_ORDER		9

#define DEFAULT_GMAC_TXQ_ORDER		8

#define DEFAULT_RX_BUF_ORDER		11

#define DEFAULT_NAPI_WEIGHT		64

#define TX_MAX_FRAGS			16

#define TX_QUEUE_NUM			1	/* max: 6 */

#define RX_MAX_ALLOC_ORDER		2
@@ -2472,8 +2471,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) 
	netdev->max_mtu = 10236 - VLAN_ETH_HLEN;



	port->freeq_refill = 0;

	netif_napi_add(netdev, &port->napi, gmac_napi_poll,

		       DEFAULT_NAPI_WEIGHT);

	netif_napi_add(netdev, &port->napi, gmac_napi_poll, NAPI_POLL_WEIGHT);



	ret = of_get_mac_address(np, mac);

	if (!ret) {

drivers/net/ethernet/marvell/skge.c

+1 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#define PHY_RETRIES	        1000

#define ETH_JUMBO_MTU		9000

#define TX_WATCHDOG		(5 * HZ)

#define NAPI_WEIGHT		64

#define BLINK_MS		250

#define LINK_HZ			HZ
@@ -3833,7 +3832,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, 
		dev->features |= NETIF_F_HIGHDMA;



	skge = netdev_priv(dev);

	netif_napi_add(dev, &skge->napi, skge_poll, NAPI_WEIGHT);

	netif_napi_add(dev, &skge->napi, skge_poll, NAPI_POLL_WEIGHT);

	skge->netdev = dev;

	skge->hw = hw;

	skge->msg_enable = netif_msg_init(debug, default_msg);

drivers/net/ethernet/marvell/sky2.c

+1 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 
#define TX_DEF_PENDING		63



#define TX_WATCHDOG		(5 * HZ)

#define NAPI_WEIGHT		64

#define PHY_RETRIES		1000



#define SKY2_EEPROM_MAGIC	0x9955aabb
@@ -4938,7 +4937,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		}

	}



	netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT);

	netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_POLL_WEIGHT);



	err = register_netdev(dev);

	if (err) {

drivers/net/ethernet/mediatek/mtk_star_emac.c

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#define MTK_STAR_WAIT_TIMEOUT			300

#define MTK_STAR_MAX_FRAME_SIZE			1514

#define MTK_STAR_SKB_ALIGNMENT			16

#define MTK_STAR_NAPI_WEIGHT			64

#define MTK_STAR_HASHTABLE_MC_LIMIT		256

#define MTK_STAR_HASHTABLE_SIZE_MAX		512
@@ -1551,7 +1550,7 @@ static int mtk_star_probe(struct platform_device *pdev) 
	ndev->netdev_ops = &mtk_star_netdev_ops;

	ndev->ethtool_ops = &mtk_star_ethtool_ops;



	netif_napi_add(ndev, &priv->napi, mtk_star_poll, MTK_STAR_NAPI_WEIGHT);

	netif_napi_add(ndev, &priv->napi, mtk_star_poll, NAPI_POLL_WEIGHT);



	return devm_register_netdev(dev, ndev);

}

drivers/net/ethernet/ti/davinci_emac.c

+1 −2
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1"; 
#define EMAC_DEF_RX_NUM_DESC		(128)

#define EMAC_DEF_MAX_TX_CH		(1) /* Max TX channels configured */

#define EMAC_DEF_MAX_RX_CH		(1) /* Max RX channels configured */

#define EMAC_POLL_WEIGHT		(64) /* Default NAPI poll weight */



/* Buffer descriptor parameters */

#define EMAC_DEF_TX_MAX_SERVICE		(32) /* TX max service BD's */
@@ -1949,7 +1948,7 @@ static int davinci_emac_probe(struct platform_device *pdev) 


	ndev->netdev_ops = &emac_netdev_ops;

	ndev->ethtool_ops = &ethtool_ops;

	netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);

	netif_napi_add(ndev, &priv->napi, emac_poll, NAPI_POLL_WEIGHT);



	pm_runtime_enable(&pdev->dev);

	rc = pm_runtime_resume_and_get(&pdev->dev);