Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce4ab73a authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by David S. Miller
Browse files

net: stmmac: drop the reset delays from struct stmmac_mdio_bus_data 



Only OF platforms use the reset delays and these delays are only read in
stmmac_mdio_reset(). Move them from struct stmmac_mdio_bus_data to a
stack variable inside stmmac_mdio_reset() because that's the only usage
of these delays.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e770b25

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

+8 −7
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ int stmmac_mdio_reset(struct mii_bus *bus) 
#ifdef CONFIG_OF

	if (priv->device->of_node) {

		struct gpio_desc *reset_gpio;

		u32 delays[3];



		reset_gpio = devm_gpiod_get_optional(priv->device,

						     "snps,reset",
@@ -261,18 +262,18 @@ int stmmac_mdio_reset(struct mii_bus *bus) 


		device_property_read_u32_array(priv->device,

					       "snps,reset-delays-us",

					       data->delays, 3);

					       delays, ARRAY_SIZE(delays));



		if (data->delays[0])

			msleep(DIV_ROUND_UP(data->delays[0], 1000));

		if (delays[0])

			msleep(DIV_ROUND_UP(delays[0], 1000));



		gpiod_set_value_cansleep(reset_gpio, 1);

		if (data->delays[1])

			msleep(DIV_ROUND_UP(data->delays[1], 1000));

		if (delays[1])

			msleep(DIV_ROUND_UP(delays[1], 1000));



		gpiod_set_value_cansleep(reset_gpio, 0);

		if (data->delays[2])

			msleep(DIV_ROUND_UP(data->delays[2], 1000));

		if (delays[2])

			msleep(DIV_ROUND_UP(delays[2], 1000));

	}

#endif

include/linux/stmmac.h

+0 −3
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ struct stmmac_mdio_bus_data { 
	unsigned int phy_mask;

	int *irqs;

	int probed_phy_irq;

#ifdef CONFIG_OF

	u32 delays[3];

#endif

};



struct stmmac_dma_cfg {