| Message ID | 20221201175525.2733125-1-l.stach@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] net: asix: Simplify return value check after asix_check_host_enable | expand |
On Thu, Dec 01, 2022 at 06:55:24PM +0100, Lucas Stach wrote: > Any negative return value from this function is indicative of an > error. Simplify the condition to cover all possible error codes. Some calls to asix_read_cmd() in asix_check_host_enable() return -ENODATA and such are simply skipped (... continue ...). It is unclear if it indicates an error or not. Thanks > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/net/usb/asix_common.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c > index 72ffc89b477a..be1e103b7a95 100644 > --- a/drivers/net/usb/asix_common.c > +++ b/drivers/net/usb/asix_common.c > @@ -504,7 +504,7 @@ static int __asix_mdio_read(struct net_device *netdev, int phy_id, int loc, > mutex_lock(&dev->phy_mutex); > > ret = asix_check_host_enable(dev, in_pm); > - if (ret == -ENODEV || ret == -ETIMEDOUT) { > + if (ret < 0) { > mutex_unlock(&dev->phy_mutex); > return ret; > } > @@ -542,7 +542,7 @@ static int __asix_mdio_write(struct net_device *netdev, int phy_id, int loc, > mutex_lock(&dev->phy_mutex); > > ret = asix_check_host_enable(dev, in_pm); > - if (ret == -ENODEV) > + if (ret < 0) > goto out; > > ret = asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, > -- > 2.30.2 >
diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c index 72ffc89b477a..be1e103b7a95 100644 --- a/drivers/net/usb/asix_common.c +++ b/drivers/net/usb/asix_common.c @@ -504,7 +504,7 @@ static int __asix_mdio_read(struct net_device *netdev, int phy_id, int loc, mutex_lock(&dev->phy_mutex); ret = asix_check_host_enable(dev, in_pm); - if (ret == -ENODEV || ret == -ETIMEDOUT) { + if (ret < 0) { mutex_unlock(&dev->phy_mutex); return ret; } @@ -542,7 +542,7 @@ static int __asix_mdio_write(struct net_device *netdev, int phy_id, int loc, mutex_lock(&dev->phy_mutex); ret = asix_check_host_enable(dev, in_pm); - if (ret == -ENODEV) + if (ret < 0) goto out; ret = asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2,
Any negative return value from this function is indicative of an error. Simplify the condition to cover all possible error codes. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/net/usb/asix_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)