diff options
| author | David Bauer <mail@david-bauer.net> | 2019-04-17 23:59:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-18 17:42:54 -0700 |
| commit | 6110ed2db3a41f3b9d676e58ac3d4637c2b497c4 (patch) | |
| tree | 504923c7b9b315877d980f8a63210674ecef21f7 /drivers/net/phy | |
| parent | 71dd6c0dff51b5f1fef2e9dfa6f6a948aac975f3 (diff) | |
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>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/at803x.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 6 | ||||
| -rw-r--r-- | drivers/net/phy/mdio_device.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 406111753f7c..222ccd9ecfce 100644 --- 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 ba3d2523808b..bd04fe762056 100644 --- 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 57668e0f9256..e282600bd83e 100644 --- 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) |