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: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 459ef8afe4fb370ca1c07a897689e806b9b182f8..c9454cf4f189fb64bc5d63e9f55f42c6880a015f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -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
 

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index a0cc6fa4965b3ec966414dfa3331fc9e1be5ca6d..7c8328edd501b6d03b45e135f1106933921535a3 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -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 {