Commit 6409249c authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: remove unnecessary .pkt_route queue initialisation 



PCI drivers explicitly set .pkt_route to zero. However, as the struct
is allocated using devm_kzalloc(), all members default to zero unless
explicitly initialised. Thus, explicitly setting these to zero is
unnecessary. Remove these. This leaves only stmmac_platform.c where
this is explicitly initialised depending on DT properties.

$ grep '\.pkt_route =' *.c
dwmac-intel.c: plat->rx_queues_cfg[0].pkt_route = 0x0;
dwmac-intel.c: plat->rx_queues_cfg[i].pkt_route = 0x0;
dwmac-loongson.c: plat->rx_queues_cfg[0].pkt_route = 0x0;
stmmac_main.c: if (priv->plat->rx_queues_cfg[queue].pkt_route == 0x0)
stmmac_pci.c: plat->rx_queues_cfg[0].pkt_route = 0x0;
stmmac_pci.c: plat->rx_queues_cfg[i].pkt_route = 0x0;
stmmac_platform.c: plat->rx_queues_cfg[queue].pkt_route = PACKET_AVCPQ;
stmmac_platform.c: plat->rx_queues_cfg[queue].pkt_route = PACKET_PTPQ;
stmmac_platform.c: plat->rx_queues_cfg[queue].pkt_route = PACKET_DCBCPQ;
stmmac_platform.c: plat->rx_queues_cfg[queue].pkt_route = PACKET_UPQ;
stmmac_platform.c: plat->rx_queues_cfg[queue].pkt_route = PACKET_MCBCQ;
stmmac_platform.c: plat->rx_queues_cfg[queue].pkt_route = 0x0;

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vJvjf-0000000EVkO-1ZaO@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0a20999e

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

+1 −8
Original line number Diff line number Diff line
@@ -569,9 +569,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat) 
	plat->force_sf_dma_mode = 1;



	plat->mdio_bus_data->needs_reset = true;



	/* Disable RX queues routing by default */

	plat->rx_queues_cfg[0].pkt_route = 0x0;

}



static struct phylink_pcs *intel_mgbe_select_pcs(struct stmmac_priv *priv,
@@ -612,13 +609,9 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, 


	plat->rx_sched_algorithm = MTL_RX_ALGORITHM_SP;



	for (i = 0; i < plat->rx_queues_to_use; i++) {

	for (i = 0; i < plat->rx_queues_to_use; i++)

		plat->rx_queues_cfg[i].mode_to_use = MTL_QUEUE_DCB;



		/* Disable RX queues routing by default */

		plat->rx_queues_cfg[i].pkt_route = 0x0;

	}



	for (i = 0; i < plat->tx_queues_to_use; i++) {

		plat->tx_queues_cfg[i].mode_to_use = MTL_QUEUE_DCB;

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ static void loongson_default_data(struct pci_dev *pdev, 
	/* Increase the default value for multicast hash bins */

	plat->multicast_filter_bins = 256;



	/* Disable RX queues routing by default */

	plat->rx_queues_cfg[0].pkt_route = 0x0;



	plat->clk_ref_rate = 125000000;

	plat->clk_ptp_rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c

+1 −6
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat) 
	plat->force_sf_dma_mode = 1;



	plat->mdio_bus_data->needs_reset = true;



	/* Disable RX queues routing by default */

	plat->rx_queues_cfg[0].pkt_route = 0x0;

}



static int stmmac_default_data(struct pci_dev *pdev,
@@ -77,10 +74,8 @@ static int snps_gmac5_default_data(struct pci_dev *pdev, 
	}



	plat->rx_sched_algorithm = MTL_RX_ALGORITHM_SP;

	for (i = 0; i < plat->rx_queues_to_use; i++) {

	for (i = 0; i < plat->rx_queues_to_use; i++)

		plat->rx_queues_cfg[i].mode_to_use = MTL_QUEUE_DCB;

		plat->rx_queues_cfg[i].pkt_route = 0x0;

	}



	plat->bus_id = 1;

	plat->phy_interface = PHY_INTERFACE_MODE_GMII;

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ static int stmmac_mtl_setup(struct platform_device *pdev, 
			plat->rx_queues_cfg[queue].pkt_route = PACKET_UPQ;

		else if (of_property_read_bool(q_node, "snps,route-multi-broad"))

			plat->rx_queues_cfg[queue].pkt_route = PACKET_MCBCQ;

		else

			plat->rx_queues_cfg[queue].pkt_route = 0x0;



		queue++;

	}