net: ag71xx: get reset control using devm api
Subsystems (3)
PATCH v4 1/1 net: ag71xx: get reset control using devm api
Currently, the of variant is missing reset_control_put in error paths. The devm variant does not require it.
Allows removing mdio_reset from the struct as it is not used outside the function.
---
v2: don't call after ag71xx_mdio_probe. Already done.
v3: use devm instead.
v4: resend
drivers/net/ethernet/atheros/ag71xx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/atheros/ag71xx.c +7 -7
@@ -379,7 +379,6 @@ struct ag71xx {u32 fifodata[3 ];int mac_idx; -struct reset_control *mdio_reset;struct clk *clk_mdio; };
@@ -683,6 +682,7 @@ static int ag71xx_mdio_probe(struct ag71xx *ag)struct device *dev = &ag->pdev->dev;struct net_device *ndev = ag->ndev;static struct mii_bus *mii_bus; +struct reset_control *mdio_reset;struct device_node *np, *mnp;int err;
@@ -698,10 +698,10 @@ static int ag71xx_mdio_probe(struct ag71xx *ag)if (!mii_bus)return -ENOMEM ; - ag->mdio_reset =of_reset_control_get_exclusive (np,"mdio" ); -if (IS_ERR (ag->mdio_reset)) { + mdio_reset =devm_reset_control_get_exclusive (dev,"mdio" ); +if (IS_ERR (mdio_reset)) {netif_err (ag, probe, ndev,"Failed to get reset mdio.\n" ); -return PTR_ERR (ag->mdio_reset); +return PTR_ERR (mdio_reset); } mii_bus->name ="ag71xx_mdio" ;
@@ -712,10 +712,10 @@ static int ag71xx_mdio_probe(struct ag71xx *ag) mii_bus->parent = dev;snprintf (mii_bus->id,MII_BUS_ID_SIZE ,"%s.%d" , np->name, ag->mac_idx); -if (!IS_ERR (ag->mdio_reset)) { -reset_control_assert (ag->mdio_reset); +if (!IS_ERR (mdio_reset)) { +reset_control_assert (mdio_reset);msleep (100 ); -reset_control_deassert (ag->mdio_reset); +reset_control_deassert (mdio_reset);msleep (200 ); }
Signature · 1 line
2.46.0
Quoted 8 lines · Rosen Penev
Currently, the of variant is missing
reset_control_putin error paths. The devm variant does not require it.Allows removing
mdio_resetfrom the struct as it is not used outside the function.Signed-off-by Rosen Penev <[email protected]>---
Quoted 7 lines · Rosen Penev
Currently, the of variant is missing
reset_control_putin error paths. The devm variant does not require it.Allows removing
mdio_resetfrom the struct as it is not used outside the function.Signed-off-by Rosen Penev <[email protected]>
You forgot to include my Reviewed-by tags from v3
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Quoted 11 lines · Oleksij Rempel
Quoted 7 lines · Rosen Penev
Currently, the of variant is missing
reset_control_putin error paths. The devm variant does not require it.Allows removing
mdio_resetfrom the struct as it is not used outside the function.Signed-off-by Rosen Penev <[email protected]>You forgot to include my Reviewed-by tags from v3
Correct. Although Jakub wants me to respin this removing that always true branch.
Quoted 6 lines
--
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |