Skip to content

Commit dc46d65

Browse files
oleremNipaLocal
authored andcommitted
net: usb: lan78xx: remove PHY register access from ethtool get_regs
Remove PHY register handling from `lan78xx_get_regs` and `lan78xx_get_regs_len`. Since the controller can have different PHYs attached, the first 32 registers are not universally relevant or the most interesting. Simplify the implementation to focus on MAC and device registers. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: NipaLocal <nipa@local>
1 parent 16af552 commit dc46d65

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

drivers/net/usb/lan78xx.c

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2096,10 +2096,7 @@ static int lan78xx_set_pause(struct net_device *net,
20962096

20972097
static int lan78xx_get_regs_len(struct net_device *netdev)
20982098
{
2099-
if (!netdev->phydev)
2100-
return (sizeof(lan78xx_regs));
2101-
else
2102-
return (sizeof(lan78xx_regs) + PHY_REG_SIZE);
2099+
return sizeof(lan78xx_regs);
21032100
}
21042101

21052102
static void
@@ -2109,7 +2106,7 @@ lan78xx_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
21092106
struct lan78xx_net *dev = netdev_priv(netdev);
21102107
unsigned int data_count = 0;
21112108
u32 *data = buf;
2112-
int i, j, ret;
2109+
int i, ret;
21132110

21142111
/* Read Device/MAC registers */
21152112
for (i = 0; i < ARRAY_SIZE(lan78xx_regs); i++) {
@@ -2124,22 +2121,6 @@ lan78xx_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
21242121
data_count++;
21252122
}
21262123

2127-
if (!netdev->phydev)
2128-
return;
2129-
2130-
/* Read PHY registers */
2131-
for (j = 0; j < 32; i++, j++) {
2132-
ret = phy_read(netdev->phydev, j);
2133-
if (ret < 0) {
2134-
netdev_warn(dev->net,
2135-
"failed to read PHY register 0x%02x\n", j);
2136-
goto clean_data;
2137-
}
2138-
2139-
data[i] = ret;
2140-
data_count++;
2141-
}
2142-
21432124
return;
21442125

21452126
clean_data:

0 commit comments

Comments
 (0)