All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: kernel@pengutronix.de,
	Stephane Grosjean <s.grosjean@peak-system.com>,
	Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [can-next-rfc 07/10] can: peak_usb: pcan_usb_get_serial(): remove error message from error path
Date: Tue,  6 Apr 2021 13:16:19 +0200	[thread overview]
Message-ID: <20210406111622.1874957-8-mkl@pengutronix.de> (raw)
In-Reply-To: <20210406111622.1874957-1-mkl@pengutronix.de>

The caller of pcan_usb_get_serial() already prints an error message,
so remove this one and return immediately.

Cc: 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



  parent reply	other threads:[~2021-04-06 11:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-06 11:16 [RFC]: can-next 2021-04-06: peak_usb cleanups Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 01/10] can: peak_usb: fix checkpatch warnings Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 02/10] can: peak_usb: pcan_usb_pro.h: remove double space in indention Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 03/10] can: peak_usb: remove unused variables from struct peak_usb_device Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 04/10] can: peak_usb: remove write only variable struct peak_usb_adapter::ts_period Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 05/10] can: peak_usb: peak_usb_probe(): make use of driver_info Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 06/10] can: peak_usb: pcan_usb_{,pro}_get_device_id(): remove unneeded check for device_id Marc Kleine-Budde
2021-04-06 11:16 ` Marc Kleine-Budde [this message]
2021-04-06 11:16 ` [can-next-rfc 08/10] can: peak_usb: pcan_usb_get_serial(): make use of le32_to_cpup() Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 09/10] can: peak_usb: pcan_usb_get_serial(): unconditionally assign serial_number Marc Kleine-Budde
2021-04-06 11:16 ` [can-next-rfc 10/10] can: peak_usb: pcan_usb: replace open coded endianness conversion of unaligned data Marc Kleine-Budde
2021-04-12  9:39 ` [RFC]: can-next 2021-04-06: peak_usb cleanups Marc Kleine-Budde
2021-04-12 10:45 ` Stéphane Grosjean
2021-04-12 11:03   ` Marc Kleine-Budde

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=20210406111622.1874957-8-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=kernel@pengutronix.de \
    --cc=linux-can@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.