zhao
b34543084f
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 8s
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 910ac7bfb1af1ae4cd141ef80e03a6729213c189 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Tue, 18 Nov 2025 01:40:30 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/net/phy/realtek/realtek_main.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
--- 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_devi
|
|
{
|
|
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_devi
|
|
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 p
|
|
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 */
|