From nobody Mon Feb 9 21:22:04 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D98D22576A for ; Mon, 10 Mar 2025 11:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741607871; cv=none; b=jEtH32mihKxPHTfhg0qGdzkzY3FmcGukX44LcVkJ/L0QZtC8b6nDIpXvNmKtq33tp4PPZLxF4YDznrQRVacq2B/zKuRxEAiIL9TmchHuEepsncypt8WXo+21yVc1zZekrmH453Nowa5OOZTlIbHAoiz3gxht7jKKz7UWX1O+Fr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741607871; c=relaxed/simple; bh=agE0DgjvQ7Cvo+66vvgwpx9SrlSJ/iDfvgGrfiPMsqA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QI22M6cB5L6omjBLF/+JhOtYJtHzXBaWKkM+U3p/KojsKddbDQtHT1/rVpl0nNVIuO2cnQ3nI1PT/GQxWnywkg7mYBaLVGeOCaeOASt8xvaOATA1IkCa8oi05IBVEAEjyAQ7Zk9U7pNURHi0WvpH13KNPi6i1Tie5GLLaou7qxo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1trblL-0000S6-Cl; Mon, 10 Mar 2025 12:57:39 +0100 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1trblK-004za1-0M; Mon, 10 Mar 2025 12:57:38 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1trblK-003I1l-07; Mon, 10 Mar 2025 12:57:38 +0100 From: Oleksij Rempel To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Woojung Huh , Andrew Lunn , Russell King , Thangaraj Samynathan , Rengarajan Sundararajan Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, Phil Elwell Subject: [PATCH net-next v3 3/7] net: usb: lan78xx: Improve error handling for PHY init path Date: Mon, 10 Mar 2025 12:57:33 +0100 Message-Id: <20250310115737.784047-4-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310115737.784047-1-o.rempel@pengutronix.de> References: <20250310115737.784047-1-o.rempel@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Make sure existing return values are actually used. Signed-off-by: Oleksij Rempel --- drivers/net/usb/lan78xx.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index dd55a9ba78fa..465762c3efcf 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2569,31 +2569,40 @@ static struct phy_device *lan7801_phy_init(struct l= an78xx_net *dev) { struct phy_device *phydev; int ret; - u32 buf; =20 phydev =3D phy_find_first(dev->mdiobus); if (!phydev) { netdev_dbg(dev->net, "PHY Not Found!! Forcing RGMII configuration\n"); ret =3D lan78xx_write_reg(dev, MAC_RGMII_ID, MAC_RGMII_ID_TXC_DELAY_EN_); + if (ret < 0) + return ERR_PTR(ret); + ret =3D lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00); - ret =3D lan78xx_read_reg(dev, HW_CFG, &buf); - buf |=3D HW_CFG_CLK125_EN_; - buf |=3D HW_CFG_REFCLK25_EN_; - ret =3D lan78xx_write_reg(dev, HW_CFG, buf); + if (ret < 0) + return ERR_PTR(ret); + + ret =3D lan78xx_update_reg(dev, HW_CFG, HW_CFG_CLK125_EN_ | + HW_CFG_REFCLK25_EN_, + HW_CFG_CLK125_EN_ | HW_CFG_REFCLK25_EN_); + if (ret < 0) + return ERR_PTR(ret); } else { if (!phydev->drv) { netdev_err(dev->net, "no PHY driver found\n"); - return NULL; + return ERR_PTR(-ENODEV); } phydev->interface =3D PHY_INTERFACE_MODE_RGMII_ID; /* The PHY driver is responsible to configure proper RGMII * interface delays. Disable RGMII delays on MAC side. */ - lan78xx_write_reg(dev, MAC_RGMII_ID, 0); + ret =3D lan78xx_write_reg(dev, MAC_RGMII_ID, 0); + if (ret < 0) + return ERR_PTR(ret); =20 phydev->is_internal =3D false; } + return phydev; } =20 @@ -2662,7 +2671,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) phydev =3D phy_find_first(dev->mdiobus); if (!phydev) { netdev_err(dev->net, "no PHY found\n"); - return -EIO; + return -ENODEV; } phydev->is_internal =3D true; phydev->interface =3D PHY_INTERFACE_MODE_GMII; @@ -2670,7 +2679,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) =20 default: netdev_err(dev->net, "Unknown CHIP ID found\n"); - return -EIO; + return -ENODEV; } =20 /* if phyirq is not set, use polling mode in phylib */ @@ -2684,7 +2693,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) if (ret) { netdev_err(dev->net, "can't attach PHY to %s, error %pe\n", dev->mdiobus->id, ERR_PTR(ret)); - return -EIO; + return ret; } =20 phy_support_eee(phydev); @@ -2698,7 +2707,10 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) sizeof(u32)); if (len >=3D 0) { /* Ensure the appropriate LEDs are enabled */ - lan78xx_read_reg(dev, HW_CFG, ®); + ret =3D lan78xx_read_reg(dev, HW_CFG, ®); + if (ret < 0) + return ret; + reg &=3D ~(HW_CFG_LED0_EN_ | HW_CFG_LED1_EN_ | HW_CFG_LED2_EN_ | @@ -2707,7 +2719,9 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) (len > 1) * HW_CFG_LED1_EN_ | (len > 2) * HW_CFG_LED2_EN_ | (len > 3) * HW_CFG_LED3_EN_; - lan78xx_write_reg(dev, HW_CFG, reg); + ret =3D lan78xx_write_reg(dev, HW_CFG, reg); + if (ret < 0) + return ret; } } =20 --=20 2.39.5