zhao
b34543084f
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 8s
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
From 4465ae435ddc0162d5033a543658449d53d46d08 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Tue, 18 Nov 2025 01:40:33 +0200
|
|
Subject: [PATCH] net: phy: realtek: create rtl8211f_config_phy_eee() helper
|
|
|
|
To simplify the rtl8211f_config_init() control flow and get rid of
|
|
"early" returns for PHYs where the PHYCR2 register is absent, move the
|
|
entire logic sub-block that deals with disabling PHY-mode EEE to a
|
|
separate function. There, it is much more obvious what the early
|
|
"return 0" skips, and it becomes more difficult to accidentally skip
|
|
unintended stuff.
|
|
|
|
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Link: https://patch.msgid.link/20251117234033.345679-7-vladimir.oltean@nxp.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/realtek/realtek_main.c | 23 ++++++++++++-----------
|
|
1 file changed, 12 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/net/phy/realtek/realtek_main.c
|
|
+++ b/drivers/net/phy/realtek/realtek_main.c
|
|
@@ -689,6 +689,17 @@ static int rtl8211f_config_aldps(struct
|
|
mask, mask);
|
|
}
|
|
|
|
+static int rtl8211f_config_phy_eee(struct phy_device *phydev)
|
|
+{
|
|
+ /* 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 */
|
|
+ return phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE, RTL8211F_PHYCR2,
|
|
+ RTL8211F_PHYCR2_PHY_EEE_ENABLE, 0);
|
|
+}
|
|
+
|
|
static int rtl8211f_config_init(struct phy_device *phydev)
|
|
{
|
|
struct device *dev = &phydev->mdio.dev;
|
|
@@ -712,17 +723,7 @@ static int rtl8211f_config_init(struct p
|
|
return ret;
|
|
}
|
|
|
|
- /* 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 */
|
|
- ret = phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE, RTL8211F_PHYCR2,
|
|
- RTL8211F_PHYCR2_PHY_EEE_ENABLE, 0);
|
|
- if (ret)
|
|
- return ret;
|
|
-
|
|
- return 0;
|
|
+ return rtl8211f_config_phy_eee(phydev);
|
|
}
|
|
|
|
static int rtl821x_suspend(struct phy_device *phydev)
|