From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de, Marc Kleine-Budde <mkl@pengutronix.de>,
Stephane Grosjean <s.grosjean@peak-system.com>
Subject: [net-next 11/14] can: peak_usb: pcan_usb_get_serial(): remove error message from error path
Date: Tue, 13 Apr 2021 11:51:58 +0200 [thread overview]
Message-ID: <20210413095201.2409865-12-mkl@pengutronix.de> (raw)
In-Reply-To: <20210413095201.2409865-1-mkl@pengutronix.de>
The caller of pcan_usb_get_serial() already prints an error message,
so remove this one and return immediately.
Link: https://lore.kernel.org/r/20210406111622.1874957-8-mkl@pengutronix.de
Acked-by: Stephane Grosjean <s.grosjean@peak-system.com>
Tested-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/peak_usb/pcan_usb.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c
index 671d589b48c1..fd5ea95fd55d 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb.c
@@ -365,16 +365,17 @@ static int pcan_usb_get_serial(struct peak_usb_device *dev, u32 *serial_number)
int err;
err = pcan_usb_wait_rsp(dev, PCAN_USB_CMD_SN, PCAN_USB_GET, args);
- if (err) {
- netdev_err(dev->netdev, "getting serial failure: %d\n", err);
- } else if (serial_number) {
+ if (err)
+ return err;
+
+ if (serial_number) {
__le32 tmp32;
memcpy(&tmp32, args, 4);
*serial_number = le32_to_cpu(tmp32);
}
- return err;
+ return 0;
}
/*
--
2.30.2
next prev parent reply other threads:[~2021-04-13 9:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 9:51 pull-request: can-next 2021-04-13 Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 01/14] dt-bindings: net: can: rcar_can: Document r8a77961 support Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 02/14] can: etas_es58x: add core support for ETAS ES58X CAN USB interfaces Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 03/14] can: etas_es58x: add support for ETAS ES581.4 CAN USB interface Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 04/14] can: etas_es58x: add support for the ETAS ES58X_FD CAN USB interfaces Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 05/14] can: peak_usb: fix checkpatch warnings Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 06/14] can: peak_usb: pcan_usb_pro.h: remove double space in indention Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 07/14] can: peak_usb: remove unused variables from struct peak_usb_device Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 08/14] can: peak_usb: remove write only variable struct peak_usb_adapter::ts_period Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 09/14] can: peak_usb: peak_usb_probe(): make use of driver_info Marc Kleine-Budde
2021-04-13 9:51 ` [net-next 10/14] can: peak_usb: pcan_usb_{,pro}_get_device_id(): remove unneeded check for device_id Marc Kleine-Budde
2021-04-13 9:51 ` Marc Kleine-Budde [this message]
2021-04-13 9:51 ` [net-next 12/14] can: peak_usb: pcan_usb_get_serial(): make use of le32_to_cpup() Marc Kleine-Budde
2021-04-13 9:52 ` [net-next 13/14] can: peak_usb: pcan_usb_get_serial(): unconditionally assign serial_number Marc Kleine-Budde
2021-04-13 9:52 ` [net-next 14/14] can: peak_usb: pcan_usb: replace open coded endianness conversion of unaligned data Marc Kleine-Budde
2021-04-13 22:00 ` pull-request: can-next 2021-04-13 patchwork-bot+netdevbpf
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=20210413095201.2409865-12-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=s.grosjean@peak-system.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).