This is a patch to the serqt_usb2.c file that fixes two instances
of the following checkpatch.pl warning:
WARNING: else is not generally useful after a break or return
Signed-off-by: Vincent Heuken <me@xxxxxxxxxxxxxxxxx>
---
drivers/staging/serqt_usb2/serqt_usb2.c | 47 +++++++++++++++++----------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index 998c384..98e9736 100644
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@ -981,9 +981,8 @@ static void qt_block_until_empty(struct tty_struct *tty,
if (wait == 0) {
dev_dbg(&qt_port->port->dev, "%s - TIMEOUT", __func__);
return;
- } else {
- wait = 30;
}
+ wait = 30;
}
}
@@ -1130,27 +1129,29 @@ static int qt_ioctl(struct tty_struct *tty,
/* this never wakes up */
interruptible_sleep_on(&qt_port->msr_wait);
#endif
+
+ char diff;
+
if (signal_pending(current))
return -ERESTARTSYS;
- else {
- char diff = qt_port->diff_status;
-
- if (diff == 0)
- return -EIO; /* no change => error */
-
- /* Consume all events */
- qt_port->diff_status = 0;
-
- if (((arg & TIOCM_RNG)
- && (diff & SERIAL_MSR_RI))
- || ((arg & TIOCM_DSR)
- && (diff & SERIAL_MSR_DSR))
- || ((arg & TIOCM_CD)
- && (diff & SERIAL_MSR_CD))
- || ((arg & TIOCM_CTS)
- && (diff & SERIAL_MSR_CTS))) {
- return 0;
- }
+
+ diff = qt_port->diff_status;
+
+ if (diff == 0)
+ return -EIO; /* no change => error */
+
+ /* Consume all events */
+ qt_port->diff_status = 0;
+
+ if (((arg & TIOCM_RNG)
+ && (diff & SERIAL_MSR_RI))
+ || ((arg & TIOCM_DSR)
+ && (diff & SERIAL_MSR_DSR))
+ || ((arg & TIOCM_CD)
+ && (diff & SERIAL_MSR_CD))
+ || ((arg & TIOCM_CTS)
+ && (diff & SERIAL_MSR_CTS))) {
+ return 0;
}
}
return 0;
@@ -1378,8 +1379,8 @@ static inline int qt_real_tiocmset(struct tty_struct *tty,
box_set_register(port->serial, index, MODEM_CONTROL_REGISTER, mcr);
if (status < 0)
return -ESPIPE;
- else
- return 0;
+
+ return 0;
}
static int qt_tiocmget(struct tty_struct *tty)
--
2.0.0
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
