From: David Bauer <mail@david-bauer.net>
To: devicetree@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v3 3/3] net: mdio: rename mdio_device reset to reset_gpio
Date: Wed, 17 Apr 2019 23:59:22 +0200 [thread overview]
Message-ID: <20190417215922.30472-4-mail@david-bauer.net> (raw)
In-Reply-To: <20190417215922.30472-1-mail@david-bauer.net>
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>
---
drivers/net/phy/at803x.c | 2 +-
drivers/net/phy/mdio_bus.c | 6 +++---
drivers/net/phy/mdio_device.c | 6 +++---
include/linux/mdio.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index f3e96191eb6f..16c5a83e2a60 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -334,7 +334,7 @@ static void at803x_link_change_notify(struct phy_device *phydev)
* cannot recover from by software.
*/
if (phydev->state == PHY_NOLINK) {
- if (phydev->mdio.reset && !priv->phy_reset) {
+ if (phydev->mdio.reset_gpio && !priv->phy_reset) {
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)
diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index 6eaf71500ef6..9dc16d5705a1 100644
--- 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;
--
2.21.0
next prev parent reply other threads:[~2019-04-17 21:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-17 21:59 [PATCH v3 0/3] net: add reset-controller driven PHY reset David Bauer
2019-04-17 21:59 ` [PATCH v3 1/3] dt-bindings: net: add PHY reset controller binding David Bauer
2019-04-17 22:15 ` Andrew Lunn
2019-04-17 21:59 ` [PATCH v3 2/3] net: phy: add support for reset-controller David Bauer
2019-04-17 22:16 ` Andrew Lunn
2019-04-17 21:59 ` David Bauer [this message]
2019-04-17 22:17 ` [PATCH v3 3/3] net: mdio: rename mdio_device reset to reset_gpio Andrew Lunn
2019-04-19 0:43 ` [PATCH v3 0/3] net: add reset-controller driven PHY reset David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190417215922.30472-4-mail@david-bauer.net \
--to=mail@david-bauer.net \
--cc=devicetree@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).