net: stmmac: drop the reset GPIO from struct stmmac_mdio_bus_data

No platform uses the "reset_gpio" field from stmmac_mdio_bus_data
anymore. Drop it so we don't get any new consumers either.

Plain GPIO numbers are being deprecated in favor of GPIO descriptors. If
needed any new non-OF platform can add a GPIO descriptor lookup table.
devm_gpiod_get_optional() will find the GPIO in that case.

Suggested-by: Linus Walleij <linus.walleij@linaro.org>
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 4614f1f2bffb4e36b5588414a01f29a4f14e9380..459ef8afe4fb370ca1c07a897689e806b9b182f8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -253,21 +253,15 @@ int stmmac_mdio_reset(struct mii_bus *bus)
        if (priv->device->of_node) {
                struct gpio_desc *reset_gpio;
 
-               if (data->reset_gpio < 0) {
-                       reset_gpio = devm_gpiod_get_optional(priv->device,
-                                                            "snps,reset",
-                                                            GPIOD_OUT_LOW);
-                       if (IS_ERR(reset_gpio))
-                               return PTR_ERR(reset_gpio);
-
-                       device_property_read_u32_array(priv->device,
-                                                      "snps,reset-delays-us",
-                                                      data->delays, 3);
-               } else {
-                       reset_gpio = gpio_to_desc(data->reset_gpio);
-
-                       gpiod_direction_output(reset_gpio, 0);
-               }
+               reset_gpio = devm_gpiod_get_optional(priv->device,
+                                                    "snps,reset",
+                                                    GPIOD_OUT_LOW);
+               if (IS_ERR(reset_gpio))
+                       return PTR_ERR(reset_gpio);
+
+               device_property_read_u32_array(priv->device,
+                                              "snps,reset-delays-us",
+                                              data->delays, 3);
 
                if (data->delays[0])
                        msleep(DIV_ROUND_UP(data->delays[0], 1000));
@@ -323,11 +317,6 @@ int stmmac_mdio_register(struct net_device *ndev)
        if (mdio_bus_data->irqs)
                memcpy(new_bus->irq, mdio_bus_data->irqs, sizeof(new_bus->irq));
 
-#ifdef CONFIG_OF
-       if (priv->device->of_node)
-               mdio_bus_data->reset_gpio = -1;
-#endif
-
        new_bus->name = "stmmac";
 
        if (priv->plat->has_xgmac) {

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index a3c2d9945bcfcab3499b4dbf275ab96fdd8af379..a0cc6fa4965b3ec966414dfa3331fc9e1be5ca6d 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -97,7 +97,6 @@ struct stmmac_mdio_bus_data {
        int *irqs;
        int probed_phy_irq;
 #ifdef CONFIG_OF
-       int reset_gpio;
        u32 delays[3];
 #endif
 };