[v1] lan78xx: Preparations for PHYlink

[PATCH net-next v1 07/11] net: usb: lan78xx: Use ETIMEDOUT instead of ETIME in lan78xx_stop_hw

Posted by Oleksij Rempel 1 year ago

Update `lan78xx_stop_hw` to return `-ETIMEDOUT` instead of `-ETIME` when
a timeout occurs. While `-ETIME` indicates a general timer expiration,
`-ETIMEDOUT` is more commonly used for signaling operation timeouts and
provides better consistency with standard error handling in the driver.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 drivers/net/usb/lan78xx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 2966f7e63617..c66e404f51ac 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -844,9 +844,7 @@ static int lan78xx_stop_hw(struct lan78xx_net *dev, u32 reg, u32 hw_enabled,
 		} while (!stopped && !time_after(jiffies, timeout));
 	}
 
-	ret = stopped ? 0 : -ETIME;
-
-	return ret;
+	return stopped ? 0 : -ETIMEDOUT;
 }
 
 static int lan78xx_flush_fifo(struct lan78xx_net *dev, u32 reg, u32 fifo_flush)
-- 
2.39.5

Re: [PATCH net-next v1 07/11] net: usb: lan78xx: Use ETIMEDOUT instead of ETIME in lan78xx_stop_hw

Posted by Andrew Lunn 1 year ago

On Mon, Dec 09, 2024 at 02:07:47PM +0100, Oleksij Rempel wrote:
> Update `lan78xx_stop_hw` to return `-ETIMEDOUT` instead of `-ETIME` when
> a timeout occurs. While `-ETIME` indicates a general timer expiration,
> `-ETIMEDOUT` is more commonly used for signaling operation timeouts and
> provides better consistency with standard error handling in the driver.
> 
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  drivers/net/usb/lan78xx.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
> index 2966f7e63617..c66e404f51ac 100644
> --- a/drivers/net/usb/lan78xx.c
> +++ b/drivers/net/usb/lan78xx.c
> @@ -844,9 +844,7 @@ static int lan78xx_stop_hw(struct lan78xx_net *dev, u32 reg, u32 hw_enabled,
>  		} while (!stopped && !time_after(jiffies, timeout));
>  	}
>  
> -	ret = stopped ? 0 : -ETIME;
> -
> -	return ret;
> +	return stopped ? 0 : -ETIMEDOUT;

I've not looked at the call stack, but tx_complete() and rx_complete()
specifically looks for ETIME. Do they need to change as well?

	Andrew

Re: [PATCH net-next v1 07/11] net: usb: lan78xx: Use ETIMEDOUT instead of ETIME in lan78xx_stop_hw

Posted by Oleksij Rempel 1 year ago

On Tue, Dec 10, 2024 at 03:08:18AM +0100, Andrew Lunn wrote:
> On Mon, Dec 09, 2024 at 02:07:47PM +0100, Oleksij Rempel wrote:
> > Update `lan78xx_stop_hw` to return `-ETIMEDOUT` instead of `-ETIME` when
> > a timeout occurs. While `-ETIME` indicates a general timer expiration,
> > `-ETIMEDOUT` is more commonly used for signaling operation timeouts and
> > provides better consistency with standard error handling in the driver.
> > 
> > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> > ---
> >  drivers/net/usb/lan78xx.c | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
> > index 2966f7e63617..c66e404f51ac 100644
> > --- a/drivers/net/usb/lan78xx.c
> > +++ b/drivers/net/usb/lan78xx.c
> > @@ -844,9 +844,7 @@ static int lan78xx_stop_hw(struct lan78xx_net *dev, u32 reg, u32 hw_enabled,
> >  		} while (!stopped && !time_after(jiffies, timeout));
> >  	}
> >  
> > -	ret = stopped ? 0 : -ETIME;
> > -
> > -	return ret;
> > +	return stopped ? 0 : -ETIMEDOUT;
> 
> I've not looked at the call stack, but tx_complete() and rx_complete()
> specifically looks for ETIME. Do they need to change as well?

No, the tx_complete() and rx_complete() will get error values in to the
urb->status from the USB stack. In this case it is a different ETIME.

I'll update commit message.

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |