net: phy: realtek: simplify bogus paged operations

Only registers 0x10~0x17 are affected by the value in the page
selection register 0x1f. Hence there is no point in using paged
operations when accessing any other registers.
Simplify the driver by using the normal phy_read and phy_write
operations for registers which are anyway not affected by paging.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Link: https://patch.msgid.link/0c5cbb66ce3e72a011d76f8c3d61ebcac44483bb.1768275364.git.daniel@makrotopia.org
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 a6b78c475ed8a99244abcef8a0031caa4711e85b..75565fbdbf6d4e90dbf5c17634e11b49212bc926 100644 (file)
--- a/drivers/net/phy/realtek/realtek_main.c
+++ b/drivers/net/phy/realtek/realtek_main.c
@@ -68,7 +68,6 @@
 #define RTL8211E_DELAY_MASK                    GENMASK(13, 11)
 
 /* RTL8211F PHY configuration */
-#define RTL8211F_PHYCR_PAGE                    0xa43
 #define RTL8211F_PHYCR1                                0x18
 #define RTL8211F_ALDPS_PLL_OFF                 BIT(1)
 #define RTL8211F_ALDPS_ENABLE                  BIT(2)
@@ -78,7 +77,6 @@
 #define RTL8211F_CLKOUT_EN                     BIT(0)
 #define RTL8211F_PHYCR2_PHY_EEE_ENABLE         BIT(5)
 
-#define RTL8211F_INSR_PAGE                     0xa43
 #define RTL8211F_INSR                          0x1d
 
 /* RTL8211F LED configuration */
@@ -333,7 +331,7 @@ static int rtl8211f_ack_interrupt(struct phy_device *phydev)
 {
        int err;
 
-       err = phy_read_paged(phydev, RTL8211F_INSR_PAGE, RTL8211F_INSR);
+       err = phy_read(phydev, RTL8211F_INSR);
 
        return (err < 0) ? err : 0;
 }
@@ -479,7 +477,7 @@ static irqreturn_t rtl8211f_handle_interrupt(struct phy_device *phydev)
 {
        int irq_status;
 
-       irq_status = phy_read_paged(phydev, RTL8211F_INSR_PAGE, RTL8211F_INSR);
+       irq_status = phy_read(phydev, RTL8211F_INSR);
        if (irq_status < 0) {
                phy_error(phydev);
                return IRQ_NONE;
@@ -670,8 +668,8 @@ static int rtl8211f_config_clk_out(struct phy_device *phydev)
                                       RTL8211FVD_CLKOUT_REG,
                                       RTL8211FVD_CLKOUT_EN, 0);
        else
-               ret = phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE,
-                                      RTL8211F_PHYCR2, RTL8211F_CLKOUT_EN, 0);
+               ret = phy_modify(phydev, RTL8211F_PHYCR2, RTL8211F_CLKOUT_EN,
+                                0);
        if (ret)
                return ret;
 
@@ -696,15 +694,14 @@ static int rtl8211f_config_aldps(struct phy_device *phydev)
        if (!priv->enable_aldps)
                return 0;
 
-       return phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE, RTL8211F_PHYCR1,
-                               mask, mask);
+       return phy_modify(phydev, RTL8211F_PHYCR1, mask, mask);
 }
 
 static int rtl8211f_config_phy_eee(struct phy_device *phydev)
 {
        /* Disable PHY-mode EEE so LPI is passed to the MAC */
-       return phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE, RTL8211F_PHYCR2,
-                               RTL8211F_PHYCR2_PHY_EEE_ENABLE, 0);
+       return phy_modify(phydev, RTL8211F_PHYCR2,
+                         RTL8211F_PHYCR2_PHY_EEE_ENABLE, 0);
 }
 
 static int rtl8211f_config_init(struct phy_device *phydev)
@@ -770,7 +767,7 @@ static int rtl8211f_suspend(struct phy_device *phydev)
                        goto err;
 
                /* Read the INSR to clear any pending interrupt */
-               phy_read_paged(phydev, RTL8211F_INSR_PAGE, RTL8211F_INSR);
+               phy_read(phydev, RTL8211F_INSR);
 
                /* Reset the WoL to ensure that an event is picked up.
                 * Unless we do this, even if we receive another packet,