net: mdio: mux-meson-g12a: use __clk_is_enabled to simplify the code
Subsystems (4)
Heiner Kallweit
maintainerPATCH 1/1 net: mdio: mux-meson-g12a: use __clk_is_enabled to simplify the code
By using __clk_is_enabled () we can avoid defining an own variable for tracking whether enable counter is zero.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/mdio/mdio-mux-meson-g12a.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/net/mdio/mdio-mux-meson-g12a.c +3 -8
@@ -52,7 +52,6 @@#define MESON_G12A_MDIO_INTERNAL_ID 1struct g12a_mdio_mux { -bool pll_is_enabled;void __iomem *regs;void *mux_handle;struct clk *pll;
@@ -152,14 +151,12 @@ static int g12a_enable_internal_mdio(struct g12a_mdio_mux *priv)int ret;/* Enable the phy clock */ -if (!priv->pll_is_enabled) { +if (!__clk_is_enabled (priv->pll)) { ret =clk_prepare_enable (priv->pll);if (ret)return ret; } - priv->pll_is_enabled = true; -/* Initialize ephy control */ writel (EPHY_G12A_ID , priv->regs +ETH_PHY_CNTL0 ); writel(FIELD_PREP(PHY_CNTL1_ST_MODE, 3) |
@@ -183,10 +180,8 @@ static int g12a_enable_external_mdio(struct g12a_mdio_mux *priv)writel_relaxed (0x0 , priv->regs +ETH_PHY_CNTL2 );/* Disable the phy clock if enabled */ -if (priv->pll_is_enabled) { +if (__clk_is_enabled (priv->pll))clk_disable_unprepare (priv->pll); - priv->pll_is_enabled = false; - }return 0 ; }
@@ -338,7 +333,7 @@ static int g12a_mdio_mux_remove(struct platform_device *pdev)mdio_mux_uninit (priv->mux_handle); -if (priv->pll_is_enabled) +if (__clk_is_enabled (priv->pll))clk_disable_unprepare (priv->pll);return 0 ;
Signature · 1 line
2.39.1
Jakub Kicinski
maintainerQuoted 4 lines · On Thu, 26 Jan 2023 21:39:16 +0100 Heiner Kallweit wrote:
By using
__clk_is_enabled() we can avoid defining an own variable for tracking whether enable counter is zero.Signed-off-by Heiner Kallweit <[email protected]>
Appears to have been applied, thanks!