From: SF Markus Elfring <elfring@users.sourceforge.net>
To: netdev@vger.kernel.org, linux-usb@vger.kernel.org,
UNGLinuxDriver@microchip.com,
Steve Glendinning <steve.glendinning@shawell.net>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] smsc95xx: Use common error handling code in smsc95xx_write_eeprom()
Date: Sun, 29 Oct 2017 11:15:08 +0100 [thread overview]
Message-ID: <fa1658cc-4363-f07f-864b-6d87dc2b656c@users.sourceforge.net> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 29 Oct 2017 11:08:34 +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_warn" by goto statements.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/usb/smsc95xx.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 309b88acd3d0..6a82e8055e9d 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -399,10 +399,8 @@ static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
/* Issue write/erase enable command */
val = E2P_CMD_BUSY_ | E2P_CMD_EWEN_;
ret = smsc95xx_write_reg(dev, E2P_CMD, val);
- if (ret < 0) {
- netdev_warn(dev->net, "Error writing E2P_DATA\n");
- return ret;
- }
+ if (ret < 0)
+ goto report_write_failure;
ret = smsc95xx_wait_eeprom(dev);
if (ret < 0)
@@ -413,10 +411,8 @@ static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
/* Fill data register */
val = data[i];
ret = smsc95xx_write_reg(dev, E2P_DATA, val);
- if (ret < 0) {
- netdev_warn(dev->net, "Error writing E2P_DATA\n");
- return ret;
- }
+ if (ret < 0)
+ goto report_write_failure;
/* Send "write" command */
val = E2P_CMD_BUSY_ | E2P_CMD_WRITE_ | (offset & E2P_CMD_ADDR_);
@@ -434,6 +430,10 @@ static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
}
return 0;
+
+report_write_failure:
+ netdev_warn(dev->net, "Error writing E2P_DATA\n");
+ return ret;
}
static int __must_check smsc95xx_write_reg_async(struct usbnet *dev, u16 index,
--
2.14.3
reply other threads:[~2017-10-29 10:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=fa1658cc-4363-f07f-864b-6d87dc2b656c@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=steve.glendinning@shawell.net \
/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
all inboxes | Powered by JetHome®