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

net: stmmac: remove unnecessary .prio queue initialisation 



stmmac_platform.c explicitly sets .prio to zero if the snps,priority
property is not present in DT for the queue. However, as the struct
is allocated using devm_kzalloc(), all members default to zero unless
explicitly initialised, and of_property_read_u32() will not write to
its argument if the property is not found. Thus, explicitly setting
these to zero is unnecessary. Remove these.

$ grep '\.prio =' *.c
stmmac_platform.c: plat->rx_queues_cfg[queue].prio = 0;
stmmac_platform.c: plat->tx_queues_cfg[queue].prio = 0;

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vJvja-0000000EVkI-0zUH@rmk-PC.armlinux.org.uk


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

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

+4 −10
Original line number Diff line number Diff line
@@ -181,12 +181,9 @@ static int stmmac_mtl_setup(struct platform_device *pdev, 
				     &plat->rx_queues_cfg[queue].chan);

		/* TODO: Dynamic mapping to be included in the future */



		if (of_property_read_u32(q_node, "snps,priority",

					&plat->rx_queues_cfg[queue].prio)) {

			plat->rx_queues_cfg[queue].prio = 0;

		} else {

		if (!of_property_read_u32(q_node, "snps,priority",

					  &plat->rx_queues_cfg[queue].prio))

			plat->rx_queues_cfg[queue].use_prio = true;

		}



		/* RX queue specific packet type routing */

		if (of_property_read_bool(q_node, "snps,route-avcp"))
@@ -257,12 +254,9 @@ static int stmmac_mtl_setup(struct platform_device *pdev, 
			plat->tx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;

		}



		if (of_property_read_u32(q_node, "snps,priority",

					&plat->tx_queues_cfg[queue].prio)) {

			plat->tx_queues_cfg[queue].prio = 0;

		} else {

		if (!of_property_read_u32(q_node, "snps,priority",

					  &plat->tx_queues_cfg[queue].prio))

			plat->tx_queues_cfg[queue].use_prio = true;

		}



		plat->tx_queues_cfg[queue].coe_unsupported =

			of_property_read_bool(q_node, "snps,coe-unsupported");