iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: mdio: mux-meson-g12a: use __clk_is_enabled to simplify the code

Browse Source 
By using __clk_is_enabled () we can avoid defining an own variable for
tracking whether enable counter is zero.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2023-01-26 21:39:16 +01:00 committed by David S. Miller
parent 70eb3911d8
commit 453d9fdc36
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/mdio/mdio-mux-meson-g12a.c
View File

@ -53,7 +53,6 @@
#define MESON_G12A_MDIO_INTERNAL_ID 1 #define MESON_G12A_MDIO_INTERNAL_ID 1
struct g12a_mdio_mux { struct g12a_mdio_mux {
bool pll_is_enabled;
void __iomem *regs; void __iomem *regs;
void *mux_handle; void *mux_handle;
struct clk *pll; struct clk *pll;
@ -154,14 +153,12 @@ static int g12a_enable_internal_mdio(struct g12a_mdio_mux *priv)
int ret; int ret;
/* Enable the phy clock */ /* Enable the phy clock */
if (!priv->pll_is_enabled) { if (!__clk_is_enabled(priv->pll)) {
ret = clk_prepare_enable(priv->pll); ret = clk_prepare_enable(priv->pll);
if (ret) if (ret)
return ret; return ret;
} }
priv->pll_is_enabled = true;
/* Initialize ephy control */ /* Initialize ephy control */
writel(EPHY_G12A_ID, priv->regs + ETH_PHY_CNTL0); writel(EPHY_G12A_ID, priv->regs + ETH_PHY_CNTL0);
@ -192,10 +189,8 @@ static int g12a_enable_external_mdio(struct g12a_mdio_mux *priv)
writel_relaxed(0x0, priv->regs + ETH_PHY_CNTL2); writel_relaxed(0x0, priv->regs + ETH_PHY_CNTL2);
/* Disable the phy clock if enabled */ /* Disable the phy clock if enabled */
if (priv->pll_is_enabled) { if (__clk_is_enabled(priv->pll))
clk_disable_unprepare(priv->pll); clk_disable_unprepare(priv->pll);
priv->pll_is_enabled = false;
}
return 0; return 0;
} }
@ -347,7 +342,7 @@ static int g12a_mdio_mux_remove(struct platform_device *pdev)
mdio_mux_uninit(priv->mux_handle); mdio_mux_uninit(priv->mux_handle);
if (priv->pll_is_enabled) if (__clk_is_enabled(priv->pll))
clk_disable_unprepare(priv->pll); clk_disable_unprepare(priv->pll);
return 0; return 0;