From: Oleksij Rempel <o.rempel@pengutronix.de>
Date: Mon, 16 Dec 2024 12:09:40 +0000 (+0100)
Subject: net: usb: lan78xx: remove PHY register access from ethtool get_regs
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d09de7ebd4abf26d9aee072b82a514c372d278b5;p=users%2Fjedix%2Flinux-maple.git

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>
Link: https://patch.msgid.link/20241216120941.1690908-6-o.rempel@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 78c75599b8f1..6c9dab290f3f 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -2096,10 +2096,7 @@ exit:
 
 static int lan78xx_get_regs_len(struct net_device *netdev)
 {
-	if (!netdev->phydev)
-		return (sizeof(lan78xx_regs));
-	else
-		return (sizeof(lan78xx_regs) + PHY_REG_SIZE);
+	return sizeof(lan78xx_regs);
 }
 
 static void
@@ -2109,7 +2106,7 @@ lan78xx_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
 	struct lan78xx_net *dev = netdev_priv(netdev);
 	unsigned int data_count = 0;
 	u32 *data = buf;
-	int i, j, ret;
+	int i, ret;
 
 	/* Read Device/MAC registers */
 	for (i = 0; i < ARRAY_SIZE(lan78xx_regs); i++) {
@@ -2124,22 +2121,6 @@ lan78xx_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
 		data_count++;
 	}
 
-	if (!netdev->phydev)
-		return;
-
-	/* Read PHY registers */
-	for (j = 0; j < 32; i++, j++) {
-		ret = phy_read(netdev->phydev, j);
-		if (ret < 0) {
-			netdev_warn(dev->net,
-				    "failed to read PHY register 0x%02x\n", j);
-			goto clean_data;
-		}
-
-		data[i] = ret;
-		data_count++;
-	}
-
 	return;
 
 clean_data: