domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

realtek: Use ADVERTISE_* and MII_PHYSID* from <linux/mii.h>

Browse Source 
Replace BIT(x) and numerical values in drivers/net/phy/rtl83xx-phy.c
with constants from <linux/mii.h> to improve code readability.

To make reviewing easier, this commit only addresses ADVERTISE_* and
MII_PHYSID* constants.

Signed-off-by: Pascal Ernster <git@hardfalcon.net>
This commit is contained in:
Pascal Ernster
2023-06-04 21:44:39 +02:00
committed by Sander Vanheule
parent 8b2f654d4c
commit 171e67e2f7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/realtek/files-5.15/drivers/net/phy/rtl83xx-phy.c
View File

@@ -221,9 +221,9 @@ int rtl839x_read_sds_phy(int phy_addr, int phy_reg)
* which would otherwise read as 0. * which would otherwise read as 0.
*/ */
if (soc_info.id == 0x8393) { if (soc_info.id == 0x8393) {
if (phy_reg == 2) if (phy_reg == MII_PHYSID1)
return 0x1c; return 0x1c;
if (phy_reg == 3) if (phy_reg == MII_PHYSID2)
return 0x8393; return 0x8393;
} }
@@ -495,10 +495,10 @@ static int rtl8226_advertise_aneg(struct phy_device *phydev)
if (v < 0) if (v < 0)
goto out; goto out;
v |= BIT(5); /* HD 10M */ v |= ADVERTISE_10HALF;
v |= BIT(6); /* FD 10M */ v |= ADVERTISE_10FULL;
v |= BIT(7); /* HD 100M */ v |= ADVERTISE_100HALF;
v |= BIT(8); /* FD 100M */ v |= ADVERTISE_100FULL;
ret = phy_write_mmd(phydev, MMD_AN, 16, v); ret = phy_write_mmd(phydev, MMD_AN, 16, v);
@@ -506,7 +506,7 @@ static int rtl8226_advertise_aneg(struct phy_device *phydev)
v = phy_read_mmd(phydev, MMD_VEND2, 0xA412); v = phy_read_mmd(phydev, MMD_VEND2, 0xA412);
if (v < 0) if (v < 0)
goto out; goto out;
v |= BIT(9); /* FD 1000M */ v |= ADVERTISE_1000FULL;
ret = phy_write_mmd(phydev, MMD_VEND2, 0xA412, v); ret = phy_write_mmd(phydev, MMD_VEND2, 0xA412, v);
if (ret < 0) if (ret < 0)