mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 18:43:33 +02:00
net: stmmac: rk: get rid of rk_phy_power_ctl()
It is not worth having a common rk_phy_power_ctl() when the only difference is which regulator function is called. Also, passing true/false is non-descriptive. Split this function, moving the code appropriately into rk_phy_powerup() and rk_phy_powerdown(). Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/E1vkL1o-00000005usJ-08hy@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
a0094edaf4
commit
af6eaf7018
|
|
@ -1498,23 +1498,26 @@ static int gmac_clk_enable(struct rk_priv_data *bsp_priv, bool enable)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rk_phy_power_ctl(struct rk_priv_data *bsp_priv, bool enable)
|
||||
static int rk_phy_powerup(struct rk_priv_data *bsp_priv)
|
||||
{
|
||||
struct regulator *ldo = bsp_priv->regulator;
|
||||
struct device *dev = bsp_priv->dev;
|
||||
int ret;
|
||||
|
||||
if (enable) {
|
||||
ret = regulator_enable(ldo);
|
||||
if (ret)
|
||||
dev_err(dev, "fail to enable phy-supply\n");
|
||||
} else {
|
||||
ret = regulator_disable(ldo);
|
||||
if (ret)
|
||||
dev_err(dev, "fail to disable phy-supply\n");
|
||||
}
|
||||
ret = regulator_enable(ldo);
|
||||
if (ret)
|
||||
dev_err(bsp_priv->dev, "fail to enable phy-supply\n");
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void rk_phy_powerdown(struct rk_priv_data *bsp_priv)
|
||||
{
|
||||
struct regulator *ldo = bsp_priv->regulator;
|
||||
int ret;
|
||||
|
||||
ret = regulator_disable(ldo);
|
||||
if (ret)
|
||||
dev_err(bsp_priv->dev, "fail to disable phy-supply\n");
|
||||
}
|
||||
|
||||
static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev,
|
||||
|
|
@ -1692,7 +1695,7 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)
|
|||
dev_err(dev, "NO interface defined!\n");
|
||||
}
|
||||
|
||||
ret = rk_phy_power_ctl(bsp_priv, true);
|
||||
ret = rk_phy_powerup(bsp_priv);
|
||||
if (ret) {
|
||||
gmac_clk_enable(bsp_priv, false);
|
||||
return ret;
|
||||
|
|
@ -1713,7 +1716,7 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac)
|
|||
|
||||
pm_runtime_put_sync(gmac->dev);
|
||||
|
||||
rk_phy_power_ctl(gmac, false);
|
||||
rk_phy_powerdown(gmac);
|
||||
gmac_clk_enable(gmac, false);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user