net: phy: realtek: eliminate has_phycr2 variable

This variable is assigned in rtl821x_probe() and used in
rtl8211f_config_init(), which is more complex than it needs to be.
Simply testing the same condition from rtl821x_probe() in
rtl8211f_config_init() yields the same result (the PHY driver ID is a
runtime invariant), but with one temporary variable less.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20251117234033.345679-4-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c
index eed939ef4e18df8f37d9d3cf898cd99cdb03f802..da1db6499c384db7f3a101e107ef1634e8df38c1 100644 (file)
--- a/drivers/net/phy/realtek/realtek_main.c
+++ b/drivers/net/phy/realtek/realtek_main.c
@@ -194,7 +194,6 @@ MODULE_LICENSE("GPL");
 
 struct rtl821x_priv {
        u16 phycr1;
-       bool has_phycr2;
        bool disable_clk_out;
        struct clk *clk;
        /* rtl8211f */
@@ -245,7 +244,6 @@ static int rtl821x_probe(struct phy_device *phydev)
 {
        struct device *dev = &phydev->mdio.dev;
        struct rtl821x_priv *priv;
-       u32 phy_id = phydev->drv->phy_id;
        int ret;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -265,7 +263,6 @@ static int rtl821x_probe(struct phy_device *phydev)
        if (of_property_read_bool(dev->of_node, "realtek,aldps-enable"))
                priv->phycr1 |= RTL8211F_ALDPS_PLL_OFF | RTL8211F_ALDPS_ENABLE | RTL8211F_ALDPS_XTAL_OFF;
 
-       priv->has_phycr2 = !(phy_id == RTL_8211FVD_PHYID);
        priv->disable_clk_out = of_property_read_bool(dev->of_node,
                                                      "realtek,clkout-disable");
 
@@ -683,7 +680,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
        if (ret)
                return ret;
 
-       if (!priv->has_phycr2)
+       /* RTL8211FVD has no PHYCR2 register */
+       if (phydev->drv->phy_id == RTL_8211FVD_PHYID)
                return 0;
 
        /* Disable PHY-mode EEE so LPI is passed to the MAC */