[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20171127153651.2115-1-gimcuan@gmail.com>
Date: Mon, 27 Nov 2017 15:36:51 +0000
From: Gimcuan Hui <gimcuan@...il.com>
To: Johan Hovold <johan@...nel.org>
Cc: gregkh@...uxfoundation.org, linux-usb@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] USB: serial: Clean up the return values of read_reg and write_reg
write_reg returns 0 on success, we can make it more explicit by returning
number 0 instead of result variable.
read_reg should return 0 on success since this is a more common pattern.
The user of read_reg has been clean-up and should be at the same commit.
Signed-off-by: Gimcuan Hui <gimcuan@...il.com>
---
drivers/usb/serial/ark3116.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 3c544782f60b..23d46ef87d64 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -83,7 +83,10 @@ static int ark3116_write_reg(struct usb_serial *serial,
usb_sndctrlpipe(serial->dev, 0),
0xfe, 0x40, val, reg,
NULL, 0, ARK_TIMEOUT);
- return result;
+ if (result)
+ return result;
+
+ return 0;
}
static int ark3116_read_reg(struct usb_serial *serial,
@@ -105,7 +108,7 @@ static int ark3116_read_reg(struct usb_serial *serial,
return result;
}
- return buf[0];
+ return 0;
}
static inline int calc_divisor(int bps)
@@ -355,13 +358,13 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)
/* read modem status */
result = ark3116_read_reg(serial, UART_MSR, buf);
- if (result < 0)
+ if (result)
goto err_close;
priv->msr = *buf;
/* read line status */
result = ark3116_read_reg(serial, UART_LSR, buf);
- if (result < 0)
+ if (result)
goto err_close;
priv->lsr = *buf;
--
2.11.0
Powered by blists - more mailing lists