In preparation for separate .config_init() implementations for YT8521 and YT8531S, let's split the yt8521_config_init() into a high-level helper that deals with page handling, and another one that implements the logic. This will ease splitting the YT8531S-specific logic out. Signed-off-by: Maxime Chevallier --- drivers/net/phy/motorcomm.c | 38 ++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/net/phy/motorcomm.c b/drivers/net/phy/motorcomm.c index c5a2cda8d31b..58e4d67b945f 100644 --- a/drivers/net/phy/motorcomm.c +++ b/drivers/net/phy/motorcomm.c @@ -1680,27 +1680,16 @@ static int yt8521_resume(struct phy_device *phydev) return yt8521_modify_utp_fiber_bmcr(phydev, BMCR_PDOWN, 0); } -/** - * yt8521_config_init() - called to initialize the PHY - * @phydev: a pointer to a &struct phy_device - * - * returns 0 or negative errno code - */ -static int yt8521_config_init(struct phy_device *phydev) +static int __yt8521_config_init(struct phy_device *phydev) { struct device *dev = &phydev->mdio.dev; - int old_page; int ret = 0; - old_page = phy_select_page(phydev, YT8521_RSSR_UTP_SPACE); - if (old_page < 0) - goto err_restore_page; - /* set rgmii delay mode */ if (phydev->interface != PHY_INTERFACE_MODE_SGMII) { ret = ytphy_rgmii_clk_delay_config(phydev); if (ret < 0) - goto err_restore_page; + return ret; } if (device_property_read_bool(dev, "motorcomm,auto-sleep-disabled")) { @@ -1708,7 +1697,7 @@ static int yt8521_config_init(struct phy_device *phydev) ret = ytphy_modify_ext(phydev, YT8521_EXTREG_SLEEP_CONTROL1_REG, YT8521_ESC1R_SLEEP_SW, 0); if (ret < 0) - goto err_restore_page; + return ret; } if (device_property_read_bool(dev, "motorcomm,keep-pll-enabled")) { @@ -1716,13 +1705,32 @@ static int yt8521_config_init(struct phy_device *phydev) ret = ytphy_modify_ext(phydev, YT8521_CLOCK_GATING_REG, YT8521_CGR_RX_CLK_EN, 0); if (ret < 0) - goto err_restore_page; + return ret; } if (phy_interface_is_rgmii(phydev) && phydev_id_compare(phydev, PHY_ID_YT8531S)) ret = yt8531_set_ds(phydev); + return ret; +} + +/** + * yt8521_config_init() - called to initialize the PHY + * @phydev: a pointer to a &struct phy_device + * + * returns 0 or negative errno code + */ +static int yt8521_config_init(struct phy_device *phydev) +{ + int old_page, ret = 0; + + old_page = phy_select_page(phydev, YT8521_RSSR_UTP_SPACE); + if (old_page < 0) + goto err_restore_page; + + ret = __yt8521_config_init(phydev); + err_restore_page: return phy_restore_page(phydev, old_page, ret); } -- 2.55.0