From: SF Markus Elfring <elfring@users.sourceforge.net>
To: netdev@vger.kernel.org, linux-usb@vger.kernel.org,
UNGLinuxDriver@microchip.com,
Woojung Huh <woojung.huh@microchip.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] lan78xx: Use common error handling code in lan78xx_phy_init()
Date: Sat, 28 Oct 2017 20:56:31 +0000 [thread overview]
Message-ID: <1aa46505-686c-8e92-78a8-b2a562ccbb9d@users.sourceforge.net> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 28 Oct 2017 22:42:52 +0200
* 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.
* Adjust two condition checks.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/usb/lan78xx.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 0161f77641fa..ff07e20621e3 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -2030,17 +2030,15 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
/* external PHY fixup for KSZ9031RNX */
ret = phy_register_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0,
ksz9031rnx_fixup);
- if (ret < 0) {
- netdev_err(dev->net, "fail to register fixup\n");
- return ret;
- }
+ if (ret)
+ goto report_fixup_failure;
+
/* external PHY fixup for LAN8835 */
ret = phy_register_fixup_for_uid(PHY_LAN8835, 0xfffffff0,
lan8835_fixup);
- if (ret < 0) {
- netdev_err(dev->net, "fail to register fixup\n");
- return ret;
- }
+ if (ret)
+ goto report_fixup_failure;
+
/* add more external PHY fixup here if needed */
phydev->is_internal = false;
@@ -2093,6 +2091,10 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
phy_unregister_fixup_for_uid(PHY_LAN8835, 0xfffffff0);
return ret;
+
+report_fixup_failure:
+ netdev_err(dev->net, "fail to register fixup\n");
+ return ret;
}
static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int size)
--
2.14.3
next reply other threads:[~2017-10-28 20:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-28 20:56 SF Markus Elfring [this message]
2017-10-30 14:32 ` [PATCH] lan78xx: Use common error handling code in lan78xx_phy_init() Woojung.Huh
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=1aa46505-686c-8e92-78a8-b2a562ccbb9d@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=UNGLinuxDriver@microchip.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=woojung.huh@microchip.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