From: SF Markus Elfring <elfring@users.sourceforge.net>
To: netdev@vger.kernel.org, linux-usb@vger.kernel.org,
"Bjørn Mork" <bjorn@mork.no>,
"David S. Miller" <davem@davemloft.net>,
"Greg Ungerer" <gerg@linux-m68k.org>,
"Liu Junliang" <liujunliang_ljl@163.com>,
"Philippe Reynes" <tremyfr@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] sr9800: Use common error handling code in sr9800_phy_powerup()
Date: Sun, 29 Oct 2017 11:45:40 +0100 [thread overview]
Message-ID: <10f2b5a4-1dbd-2c4f-caaa-4225dff35296@users.sourceforge.net> (raw)
From: Markus Elfring <elfring@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 <elfring@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
next reply other threads:[~2017-10-29 10:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-29 10:45 SF Markus Elfring [this message]
2017-10-29 11:06 ` [PATCH] sr9800: Use common error handling code in sr9800_phy_powerup() Geert Uytterhoeven
2017-10-29 12:03 ` SF Markus Elfring
2017-10-30 9:59 ` Geert Uytterhoeven
2017-11-04 15:03 ` SF Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10f2b5a4-1dbd-2c4f-caaa-4225dff35296@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=bjorn@mork.no \
--cc=davem@davemloft.net \
--cc=gerg@linux-m68k.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=liujunliang_ljl@163.com \
--cc=netdev@vger.kernel.org \
--cc=tremyfr@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).