From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sun, 29 Oct 2017 11:33:14 +0100

Add a jump target so that a specific error message is stored only once
at the end of this function implementation.
Replace two calls of the function "netdev_err" by goto statements.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/net/usb/sr9800.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
index 9277a0f228df..79cfa72c68ba 100644
--- a/drivers/net/usb/sr9800.c
+++ b/drivers/net/usb/sr9800.c
@@ -700,10 +700,9 @@ static int sr9800_phy_powerup(struct usbnet *dev)
 
        /* set the embedded Ethernet PHY in power-up state */
        ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
-       if (ret < 0) {
-               netdev_err(dev->net, "Failed to reset PHY: %d\n", ret);
-               return ret;
-       }
+       if (ret < 0)
+               goto report_reset_failure;
+
        msleep(600);
 
        /* set the embedded Ethernet PHY in reset state */
@@ -716,12 +715,14 @@ static int sr9800_phy_powerup(struct usbnet *dev)
 
        /* set the embedded Ethernet PHY in power-up state */
        ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
-       if (ret < 0) {
-               netdev_err(dev->net, "Failed to reset PHY: %d\n", ret);
-               return ret;
-       }
+       if (ret < 0)
+               goto report_reset_failure;
 
        return 0;
+
+report_reset_failure:
+       netdev_err(dev->net, "Failed to reset PHY: %d\n", ret);
+       return ret;
 }
 
 static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf)
-- 
2.14.3

Reply via email to