* [PATCH] Staging: serqt_usb2: fixed frivolous else statement warnings
@ 2014-06-20 13:23 Vincent Heuken
2014-06-20 15:31 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Vincent Heuken @ 2014-06-20 13:23 UTC (permalink / raw)
To: gregkh, thomas_75, paul.gortmaker, himangi774, arnd, aybuke.147
Cc: devel, linux-kernel, Vincent Heuken
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@vincentheuken.com>
---
drivers/staging/serqt_usb2/serqt_usb2.c | 44 ++++++++++++++++-----------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index 998c384..c356542 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;
}
}
@@ -1132,25 +1131,24 @@ static int qt_ioctl(struct tty_struct *tty,
#endif
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;
- }
+
+ 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;
}
}
return 0;
@@ -1378,8 +1376,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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Staging: serqt_usb2: fixed frivolous else statement warnings
2014-06-20 13:23 Vincent Heuken
@ 2014-06-20 15:31 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2014-06-20 15:31 UTC (permalink / raw)
To: Vincent Heuken
Cc: thomas_75, paul.gortmaker, himangi774, arnd, aybuke.147, devel,
linux-kernel
On Fri, Jun 20, 2014 at 06:23:17AM -0700, Vincent Heuken wrote:
> 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@vincentheuken.com>
> ---
> drivers/staging/serqt_usb2/serqt_usb2.c | 44 ++++++++++++++++-----------------
> 1 file changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
> index 998c384..c356542 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;
> }
> }
>
> @@ -1132,25 +1131,24 @@ static int qt_ioctl(struct tty_struct *tty,
> #endif
> 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;
> - }
> +
> + char diff = qt_port->diff_status;
This change causes a compiler warning, please be more careful in your
patches. Can you fix this up and resend?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Staging: serqt_usb2: fixed frivolous else statement warnings
@ 2014-06-20 16:31 Vincent Heuken
2014-06-20 16:43 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Vincent Heuken @ 2014-06-20 16:31 UTC (permalink / raw)
To: gregkh, thomas_75, himangi774, paul.gortmaker, aybuke.147, arnd
Cc: devel, linux-kernel, Vincent Heuken
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@vincentheuken.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Staging: serqt_usb2: fixed frivolous else statement warnings
2014-06-20 16:31 [PATCH] Staging: serqt_usb2: fixed frivolous else statement warnings Vincent Heuken
@ 2014-06-20 16:43 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2014-06-20 16:43 UTC (permalink / raw)
To: Vincent Heuken
Cc: thomas_75, himangi774, paul.gortmaker, aybuke.147, arnd, devel,
linux-kernel
On Fri, Jun 20, 2014 at 09:31:28AM -0700, Vincent Heuken wrote:
> 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@vincentheuken.com>
> ---
> 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;
A variable definition should be at the beginning of the function, not in
the middle.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Staging: serqt_usb2: fixed frivolous else statement warnings
@ 2014-06-20 16:49 Vincent Heuken
0 siblings, 0 replies; 5+ messages in thread
From: Vincent Heuken @ 2014-06-20 16:49 UTC (permalink / raw)
To: gregkh, thomas_75, himangi774, paul.gortmaker, aybuke.147, arnd
Cc: devel, linux-kernel, Vincent Heuken
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: Vincent Heuken <me@vincentheuken.com>
---
drivers/staging/serqt_usb2/serqt_usb2.c | 45 ++++++++++++++++-----------------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index 998c384..c1259c8 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;
}
}
@@ -1119,6 +1118,7 @@ static int qt_ioctl(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data;
struct quatech_port *qt_port = qt_get_port_private(port);
unsigned int index;
+ char diff;
dev_dbg(&port->dev, "%s cmd 0x%04x\n", __func__, cmd);
@@ -1132,25 +1132,24 @@ static int qt_ioctl(struct tty_struct *tty,
#endif
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 +1377,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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-20 16:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-20 16:31 [PATCH] Staging: serqt_usb2: fixed frivolous else statement warnings Vincent Heuken
2014-06-20 16:43 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2014-06-20 16:49 Vincent Heuken
2014-06-20 13:23 Vincent Heuken
2014-06-20 15:31 ` Greg KH
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.