mdio_bus: handle only single PHY reset GPIO

Commit 4c5e7a2c0501 ("dt-bindings: mdio: Clarify binding document")
declared that a MDIO reset GPIO property should have only a single GPIO
reference/specifier, however the supporting code was left intact, still
burdening the kernel with now apparently useless loops -- get rid of them.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 4c169dbf9138b39c6b3d5e9eb30b9fb03c79c016..5d37716e779692367acd96ca87ed744403562043 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -353,33 +353,22 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
 
        mutex_init(&bus->mdio_lock);
 
-       /* de-assert bus level PHY GPIO resets */
-       if (bus->num_reset_gpios > 0) {
-               bus->reset_gpiod = devm_kcalloc(&bus->dev,
-                                                bus->num_reset_gpios,
-                                                sizeof(struct gpio_desc *),
-                                                GFP_KERNEL);
-               if (!bus->reset_gpiod)
-                       return -ENOMEM;
-       }
-
-       for (i = 0; i < bus->num_reset_gpios; i++) {
-               gpiod = devm_gpiod_get_index(&bus->dev, "reset", i,
-                                            GPIOD_OUT_LOW);
-               if (IS_ERR(gpiod)) {
-                       err = PTR_ERR(gpiod);
-                       if (err != -ENOENT) {
-                               dev_err(&bus->dev,
-                                       "mii_bus %s couldn't get reset GPIO\n",
-                                       bus->id);
-                               return err;
-                       }
-               } else {
-                       bus->reset_gpiod[i] = gpiod;
-                       gpiod_set_value_cansleep(gpiod, 1);
-                       udelay(bus->reset_delay_us);
-                       gpiod_set_value_cansleep(gpiod, 0);
+       /* de-assert bus level PHY GPIO reset */
+       gpiod = devm_gpiod_get(&bus->dev, "reset", GPIOD_OUT_LOW);
+       if (IS_ERR(gpiod)) {
+               err = PTR_ERR(gpiod);
+               if (err != -ENOENT) {
+                       dev_err(&bus->dev,
+                               "mii_bus %s couldn't get reset GPIO\n",
+                               bus->id);
+                       return err;
                }
+       } else  {
+               bus->reset_gpiod = gpiod;
+
+               gpiod_set_value_cansleep(gpiod, 1);
+               udelay(bus->reset_delay_us);
+               gpiod_set_value_cansleep(gpiod, 0);
        }
 
        if (bus->reset)
@@ -414,10 +403,8 @@ error:
        }
 
        /* Put PHYs in RESET to save power */
-       for (i = 0; i < bus->num_reset_gpios; i++) {
-               if (bus->reset_gpiod[i])
-                       gpiod_set_value_cansleep(bus->reset_gpiod[i], 1);
-       }
+       if (bus->reset_gpiod)
+               gpiod_set_value_cansleep(bus->reset_gpiod, 1);
 
        device_del(&bus->dev);
        return err;
@@ -442,10 +429,8 @@ void mdiobus_unregister(struct mii_bus *bus)
        }
 
        /* Put PHYs in RESET to save power */
-       for (i = 0; i < bus->num_reset_gpios; i++) {
-               if (bus->reset_gpiod[i])
-                       gpiod_set_value_cansleep(bus->reset_gpiod[i], 1);
-       }
+       if (bus->reset_gpiod)
+               gpiod_set_value_cansleep(bus->reset_gpiod, 1);
 
        device_del(&bus->dev);
 }

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 7e4c80f9b6cda0d37fe7ecca5fb276687ffa9c1e..9596be9a49d0907bb376195a7cc657b1ecd087bd 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -226,7 +226,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
        /* Get bus level PHY reset GPIO details */
        mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;
        of_property_read_u32(np, "reset-delay-us", &mdio->reset_delay_us);
-       mdio->num_reset_gpios = of_gpio_named_count(np, "reset-gpios");
 
        /* Register the MDIO bus */
        rc = mdiobus_register(mdio);

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 414242200a9040427b5dbd1d1783782e4edddd04..51bea659340950f3b7a23417455211f92f456528 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -226,10 +226,8 @@ struct mii_bus {
 
        /* GPIO reset pulse width in microseconds */
        int reset_delay_us;
-       /* Number of reset GPIOs */
-       int num_reset_gpios;
-       /* Array of RESET GPIO descriptors */
-       struct gpio_desc **reset_gpiod;
+       /* RESET GPIO descriptor pointer */
+       struct gpio_desc *reset_gpiod;
 };
 #define to_mii_bus(d) container_of(d, struct mii_bus, dev)