diff mbox series

[net-next] net: phy: at803x: disable vddio regulator

Message ID 20200130175402.19567-1-michael@walle.cc
State Accepted
Delegated to: David Miller
Headers show
Series [net-next] net: phy: at803x: disable vddio regulator | expand

Commit Message

Michael Walle Jan. 30, 2020, 5:54 p.m. UTC 
The probe() might enable a VDDIO regulator, which needs to be disabled
again before calling regulator_put(). Add a remove() function.

Fixes: 2f664823a470 ("net: phy: at803x: add device tree binding")
Signed-off-by: Michael Walle <michael@walle.cc>
---
 drivers/net/phy/at803x.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Florian Fainelli Jan. 30, 2020, 5:58 p.m. UTC | #1 
On 1/30/20 9:54 AM, Michael Walle wrote:
> The probe() might enable a VDDIO regulator, which needs to be disabled
> again before calling regulator_put(). Add a remove() function.
> 
> Fixes: 2f664823a470 ("net: phy: at803x: add device tree binding")
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Jakub Kicinski Jan. 31, 2020, 3:58 p.m. UTC | #2 
On Thu, 30 Jan 2020 18:54:02 +0100, Michael Walle wrote:
> The probe() might enable a VDDIO regulator, which needs to be disabled
> again before calling regulator_put(). Add a remove() function.
> 
> Fixes: 2f664823a470 ("net: phy: at803x: add device tree binding")
> Signed-off-by: Michael Walle <michael@walle.cc>

Applied, thank you!
diff mbox series

Patch

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index aee62610bade..481cf48c9b9e 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -489,6 +489,14 @@  static int at803x_probe(struct phy_device *phydev)
 	return at803x_parse_dt(phydev);
 }
 
+static void at803x_remove(struct phy_device *phydev)
+{
+	struct at803x_priv *priv = phydev->priv;
+
+	if (priv->vddio)
+		regulator_disable(priv->vddio);
+}
+
 static int at803x_clk_out_config(struct phy_device *phydev)
 {
 	struct at803x_priv *priv = phydev->priv;
@@ -711,6 +719,7 @@  static struct phy_driver at803x_driver[] = {
 	.name			= "Qualcomm Atheros AR8035",
 	.phy_id_mask		= AT803X_PHY_ID_MASK,
 	.probe			= at803x_probe,
+	.remove			= at803x_remove,
 	.config_init		= at803x_config_init,
 	.set_wol		= at803x_set_wol,
 	.get_wol		= at803x_get_wol,
@@ -726,6 +735,7 @@  static struct phy_driver at803x_driver[] = {
 	.name			= "Qualcomm Atheros AR8030",
 	.phy_id_mask		= AT803X_PHY_ID_MASK,
 	.probe			= at803x_probe,
+	.remove			= at803x_remove,
 	.config_init		= at803x_config_init,
 	.link_change_notify	= at803x_link_change_notify,
 	.set_wol		= at803x_set_wol,
@@ -741,6 +751,7 @@  static struct phy_driver at803x_driver[] = {
 	.name			= "Qualcomm Atheros AR8031/AR8033",
 	.phy_id_mask		= AT803X_PHY_ID_MASK,
 	.probe			= at803x_probe,
+	.remove			= at803x_remove,
 	.config_init		= at803x_config_init,
 	.set_wol		= at803x_set_wol,
 	.get_wol		= at803x_get_wol,