Commit ee01e633 authored by Vincent Heuken's avatar Vincent Heuken Committed by Greg Kroah-Hartman

Staging: serqt_usb2: fixed frivolous else statement warnings

This is a patch to the serqt_usb2.c file that fixes three instances
of the following checkpatch.pl warning:
WARNING: else is not generally useful after a break or return
Signed-off-by: default avatarVincent Heuken <me@vincentheuken.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b913529
...@@ -982,9 +982,8 @@ static void qt_block_until_empty(struct tty_struct *tty, ...@@ -982,9 +982,8 @@ static void qt_block_until_empty(struct tty_struct *tty,
if (wait == 0) { if (wait == 0) {
dev_dbg(&qt_port->port->dev, "%s - TIMEOUT", __func__); dev_dbg(&qt_port->port->dev, "%s - TIMEOUT", __func__);
return; return;
} else {
wait = 30;
} }
wait = 30;
} }
} }
...@@ -1120,6 +1119,7 @@ static int qt_ioctl(struct tty_struct *tty, ...@@ -1120,6 +1119,7 @@ static int qt_ioctl(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct quatech_port *qt_port = qt_get_port_private(port); struct quatech_port *qt_port = qt_get_port_private(port);
unsigned int index; unsigned int index;
char diff;
dev_dbg(&port->dev, "%s cmd 0x%04x\n", __func__, cmd); dev_dbg(&port->dev, "%s cmd 0x%04x\n", __func__, cmd);
...@@ -1133,25 +1133,24 @@ static int qt_ioctl(struct tty_struct *tty, ...@@ -1133,25 +1133,24 @@ static int qt_ioctl(struct tty_struct *tty,
#endif #endif
if (signal_pending(current)) if (signal_pending(current))
return -ERESTARTSYS; return -ERESTARTSYS;
else {
char diff = qt_port->diff_status; diff = qt_port->diff_status;
if (diff == 0) if (diff == 0)
return -EIO; /* no change => error */ return -EIO; /* no change => error */
/* Consume all events */ /* Consume all events */
qt_port->diff_status = 0; qt_port->diff_status = 0;
if (((arg & TIOCM_RNG) if (((arg & TIOCM_RNG)
&& (diff & SERIAL_MSR_RI)) && (diff & SERIAL_MSR_RI))
|| ((arg & TIOCM_DSR) || ((arg & TIOCM_DSR)
&& (diff & SERIAL_MSR_DSR)) && (diff & SERIAL_MSR_DSR))
|| ((arg & TIOCM_CD) || ((arg & TIOCM_CD)
&& (diff & SERIAL_MSR_CD)) && (diff & SERIAL_MSR_CD))
|| ((arg & TIOCM_CTS) || ((arg & TIOCM_CTS)
&& (diff & SERIAL_MSR_CTS))) { && (diff & SERIAL_MSR_CTS))) {
return 0; return 0;
}
} }
} }
return 0; return 0;
...@@ -1379,8 +1378,8 @@ static inline int qt_real_tiocmset(struct tty_struct *tty, ...@@ -1379,8 +1378,8 @@ static inline int qt_real_tiocmset(struct tty_struct *tty,
box_set_register(port->serial, index, MODEM_CONTROL_REGISTER, mcr); box_set_register(port->serial, index, MODEM_CONTROL_REGISTER, mcr);
if (status < 0) if (status < 0)
return -ESPIPE; return -ESPIPE;
else
return 0; return 0;
} }
static int qt_tiocmget(struct tty_struct *tty) static int qt_tiocmget(struct tty_struct *tty)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment