| Message ID | 20241209130751.703182-10-o.rempel@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 21fff45a6cc1b5fceeedc5f6e2ccb118d4c19063 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | lan78xx: Preparations for PHYlink | expand |
On Mon, Dec 09, 2024 at 02:07:49PM +0100, Oleksij Rempel wrote: > Update `lan78xx_phy_wait_not_busy` to forward errors from > `lan78xx_read_reg` instead of overwriting them with `-EIO`. Replace > `-EIO` with `-ETIMEDOUT` for timeout cases, providing more specific and > appropriate error codes. > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/net/usb/lan78xx.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c > index fdeb95db529b..9852526be002 100644 > --- a/drivers/net/usb/lan78xx.c > +++ b/drivers/net/usb/lan78xx.c > @@ -961,14 +961,14 @@ static int lan78xx_phy_wait_not_busy(struct lan78xx_net *dev) > > do { > ret = lan78xx_read_reg(dev, MII_ACC, &val); > - if (unlikely(ret < 0)) > - return -EIO; > + if (ret < 0) > + return ret; > > if (!(val & MII_ACC_MII_BUSY_)) > return 0; > } while (!time_after(jiffies, start_time + HZ)); > > - return -EIO; > + return -ETIMEDOUT; It would be better to replace this with an iopoll.h helper. However, the change you made is O.K. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index fdeb95db529b..9852526be002 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -961,14 +961,14 @@ static int lan78xx_phy_wait_not_busy(struct lan78xx_net *dev) do { ret = lan78xx_read_reg(dev, MII_ACC, &val); - if (unlikely(ret < 0)) - return -EIO; + if (ret < 0) + return ret; if (!(val & MII_ACC_MII_BUSY_)) return 0; } while (!time_after(jiffies, start_time + HZ)); - return -EIO; + return -ETIMEDOUT; } static inline u32 mii_access(int id, int index, int read)
Update `lan78xx_phy_wait_not_busy` to forward errors from `lan78xx_read_reg` instead of overwriting them with `-EIO`. Replace `-EIO` with `-ETIMEDOUT` for timeout cases, providing more specific and appropriate error codes. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/usb/lan78xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)