net: mdio: rename mdio_device reset to reset_gpio

This renames the GPIO reset of mdio devices from 'reset' to
'reset_gpio' to better differentiate between GPIO and
reset-controller driven reset line.

Signed-off-by: David Bauer <mail@david-bauer.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 4061117..222ccd9 100644 (file)
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -331,7 +331,7 @@ static void at803x_link_change_notify(struct phy_device *phydev)
         * in the FIFO. In such cases, the FIFO enters an error mode it
         * cannot recover from by software.
         */
-       if (phydev->state == PHY_NOLINK && phydev->mdio.reset) {
+       if (phydev->state == PHY_NOLINK && phydev->mdio.reset_gpio) {
                struct at803x_context context;
 
                at803x_context_save(phydev, &context);

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index ba3d252..bd04fe7 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -56,7 +56,7 @@ static int mdiobus_register_gpiod(struct mdio_device *mdiodev)
                        return PTR_ERR(gpiod);
        }
 
-       mdiodev->reset = gpiod;
+       mdiodev->reset_gpio = gpiod;
 
        return 0;
 }
@@ -469,8 +469,8 @@ void mdiobus_unregister(struct mii_bus *bus)
                if (!mdiodev)
                        continue;
 
-               if (mdiodev->reset)
-                       gpiod_put(mdiodev->reset);
+               if (mdiodev->reset_gpio)
+                       gpiod_put(mdiodev->reset_gpio);
 
                mdiodev->device_remove(mdiodev);
                mdiodev->device_free(mdiodev);

diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 57668e0..e282600 100644 (file)
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c
@@ -117,11 +117,11 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value)
 {
        unsigned int d;
 
-       if (!mdiodev->reset && !mdiodev->reset_ctrl)
+       if (!mdiodev->reset_gpio && !mdiodev->reset_ctrl)
                return;
 
-       if (mdiodev->reset)
-               gpiod_set_value(mdiodev->reset, value);
+       if (mdiodev->reset_gpio)
+               gpiod_set_value(mdiodev->reset_gpio, value);
 
        if (mdiodev->reset_ctrl) {
                if (value)

diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index 6eaf715..9dc16d5 100644 (file)
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -39,7 +39,7 @@ struct mdio_device {
        /* Bus address of the MDIO device (0-31) */
        int addr;
        int flags;
-       struct gpio_desc *reset;
+       struct gpio_desc *reset_gpio;
        struct reset_control *reset_ctrl;
        unsigned int reset_assert_delay;
        unsigned int reset_deassert_delay;