Thread (3 messages) 3 messages, 2 authors, 2021-12-29

Re: [PATCH] net/usb: remove goto in ax88772_reset()

From: Adam Kandur <hidden>
Date: 2021-12-29 13:27:17
Also in: lkml, netdev

Greetings.
I thought, there is no reason to have out label. Because it has only
one return statement and there is return 0 before. So it seemed to me
that "goto out;" could be replaced with the "return ret;" line. Which
seems more readable to me.

thanks,

adam k.

On Wed, Dec 29, 2021 at 4:14 PM Greg KH [off-list ref] wrote:
On Wed, Dec 29, 2021 at 03:57:30PM +0300, Adam Kandur wrote:
quoted
goto statements in ax88772_reset() in net/usb/asix_devices.c are used
to return ret variable. As function by default returns 0 if ret
variable >= 0 and "out:" only returns ret, I assume goto might be
removed.

Signed-off-by: Adam Kandur <redacted>

---
 drivers/net/usb/asix_devices.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 4514d35ef..9de5fc53f 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -332,23 +332,20 @@ static int ax88772_reset(struct usbnet *dev)
      ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0,
                           ETH_ALEN, data->mac_addr, 0);
      if (ret < 0)
-             goto out;
+             return ret;

      /* Set RX_CTL to default values with 2k buffer, and enable cactus */
      ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL, 0);
      if (ret < 0)
-             goto out;
+             return ret;

      ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT, 0);
      if (ret < 0)
-             goto out;
+             return ret;

      phy_start(priv->phydev);

      return 0;
-
-out:
-     return ret;
 }
There is nothing wrong with the goto here, it's the common error path
style for the kernel.  Why should it be removed?  What is the benefit
here?

thanks,

greg k-h
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help