Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1322460 > unrolled thread

[PATCH 00/14] USB: serial: Fix coccinelle warnings

Started byMathieu OTHACEHE <m.othacehe@gmail.com>
First post2016-01-30 18:50 +0100
Last post2016-01-31 21:20 +0100
Articles 14 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 00/14] USB: serial: Fix coccinelle warnings Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 06/14] USB: serial: garmin_gps: move constants to right Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 02/14] USB: serial: safe_serial: fix assignment of bool to non 0/1 constant Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 05/14] USB: serial: mos7840: remove comparison to bool Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 13/14] USB: serial: f81232: move constants to right Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 03/14] USB: serial: quatech2: remove comparison to bool Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 11/14] USB: serial: mos7840: move constants to right Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
      Re: [PATCH 11/14] USB: serial: mos7840: move constants to right Bjørn Mork <bjorn@mork.no> - 2016-01-31 22:40 +0100
        Re: [PATCH 11/14] USB: serial: mos7840: move constants to right Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-02-01 13:00 +0100
          Re: [PATCH 11/14] USB: serial: mos7840: move constants to right Bjørn Mork <bjorn@mork.no> - 2016-02-01 13:40 +0100
    [PATCH 10/14] USB: serial: garmin_gps: remove unneeded variable Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 01/14] USB: serial: safe_serial: fix assignment of bool to 0/1 Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    [PATCH 08/14] USB: serial: keyspan: remove unused semicolon Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-01-30 18:50 +0100
    Re: [PATCH 00/14] USB: serial: Fix coccinelle warnings Johan Hovold <johan@kernel.org> - 2016-01-31 21:20 +0100

#1322460 — [PATCH 00/14] USB: serial: Fix coccinelle warnings

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 00/14] USB: serial: Fix coccinelle warnings
Message-ID<qWHOO-7mY-3@gated-at.bofh.it>
This series of patches fixes all coccinelle warnings in
USB serial subsystem

Mathieu OTHACEHE (14):
  USB: serial: safe_serial: fix assignment of bool to 0/1
  USB: serial: safe_serial: fix assignment of bool to non 0/1 constant
  USB: serial: quatech2: remove comparison to bool
  USB: serial: iuu_phoenix: remove comparison of bool
  USB: serial: mos7840: remove comparison to bool
  USB: serial: garmin_gps: move constants to right
  USB: serial: ftdi_sio: move constants to right
  USB: serial: keyspan: remove unused semicolon
  USB: serial: cyberjack: remove unneeded variable
  USB: serial: garmin_gps: remove unneeded variable
  USB: serial: mos7840: move constants to right
  USB: serial: ch341: move constants to right
  USB: serial: f81232: move constants to right
  USB: serial: kl5kusb105: remove unneeded semicolons

 drivers/usb/serial/ch341.c       |  2 +-
 drivers/usb/serial/cyberjack.c   |  3 +--
 drivers/usb/serial/f81232.c      |  2 +-
 drivers/usb/serial/ftdi_sio.c    | 16 ++++++-------
 drivers/usb/serial/ftdi_sio.h    |  8 +++----
 drivers/usb/serial/garmin_gps.c  | 51 ++++++++++++++++++++--------------------
 drivers/usb/serial/iuu_phoenix.c |  4 ++--
 drivers/usb/serial/keyspan.c     |  2 +-
 drivers/usb/serial/kl5kusb105.c  |  3 ---
 drivers/usb/serial/mos7840.c     |  8 +++----
 drivers/usb/serial/quatech2.c    |  2 +-
 drivers/usb/serial/safe_serial.c | 11 +++------
 12 files changed, 51 insertions(+), 61 deletions(-)

-- 
2.6.4

[toc] | [next] | [standalone]

#1322461 — [PATCH 06/14] USB: serial: garmin_gps: move constants to right

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 06/14] USB: serial: garmin_gps: move constants to right
Message-ID<qWHOP-7mY-27@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warning:

drivers/usb/serial/garmin_gps.c:1195:3-4: Move constant to right.
drivers/usb/serial/garmin_gps.c:1206:6-7: Move constant to right.
drivers/usb/serial/garmin_gps.c:1252:5-6: Move constant to right.
drivers/usb/serial/garmin_gps.c:1257:6-7: Move constant to right.
drivers/usb/serial/garmin_gps.c:1279:7-8: Move constant to right.
drivers/usb/serial/garmin_gps.c:1359:5-6: Move constant to right.
drivers/usb/serial/garmin_gps.c:1081:9-31: Move constant to right.
drivers/usb/serial/garmin_gps.c:1028:5-24: Move constant to right.
drivers/usb/serial/garmin_gps.c:973:6-25: Move constant to right.
drivers/usb/serial/garmin_gps.c:426:6-10: Move constant to right.
drivers/usb/serial/garmin_gps.c:428:13-17: Move constant to right.
drivers/usb/serial/garmin_gps.c:428:28-32: Move constant to right.
drivers/usb/serial/garmin_gps.c:531:6-10: Move constant to right.
drivers/usb/serial/garmin_gps.c:639:5-24: Move constant to right.
drivers/usb/serial/garmin_gps.c:691:9-13: Move constant to right.
drivers/usb/serial/garmin_gps.c:353:2-6: Move constant to right.
drivers/usb/serial/garmin_gps.c:369:10-14: Move constant to right.
drivers/usb/serial/garmin_gps.c:240:5-6: Move constant to right.
drivers/usb/serial/garmin_gps.c:242:5-6: Move constant to right.

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/garmin_gps.c | 48 ++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index db591d1..c0bbe44 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -237,10 +237,10 @@ static inline int getDataLength(const __u8 *usbPacket)
  */
 static inline int isAbortTrfCmnd(const unsigned char *buf)
 {
-	if (0 == memcmp(buf, GARMIN_STOP_TRANSFER_REQ,
-					sizeof(GARMIN_STOP_TRANSFER_REQ)) ||
-	    0 == memcmp(buf, GARMIN_STOP_TRANSFER_REQ_V2,
-					sizeof(GARMIN_STOP_TRANSFER_REQ_V2)))
+	if (memcmp(buf, GARMIN_STOP_TRANSFER_REQ,
+			sizeof(GARMIN_STOP_TRANSFER_REQ)) == 0 ||
+	    memcmp(buf, GARMIN_STOP_TRANSFER_REQ_V2,
+			sizeof(GARMIN_STOP_TRANSFER_REQ_V2)) == 0)
 		return 1;
 	else
 		return 0;
@@ -350,7 +350,7 @@ static int gsp_send_ack(struct garmin_data *garmin_data_p, __u8 pkt_id)
 	unsigned  l = 0;
 
 	dev_dbg(&garmin_data_p->port->dev, "%s - pkt-id: 0x%X.\n", __func__,
-		0xFF & pkt_id);
+			pkt_id & 0xFF);
 
 	*ptr++ = DLE;
 	*ptr++ = ACK;
@@ -366,7 +366,7 @@ static int gsp_send_ack(struct garmin_data *garmin_data_p, __u8 pkt_id)
 		*ptr++ = DLE;
 
 	*ptr++ = 0;
-	*ptr++ = 0xFF & (-cksum);
+	*ptr++ = (-cksum) & 0xFF;
 	*ptr++ = DLE;
 	*ptr++ = ETX;
 
@@ -423,9 +423,9 @@ static int gsp_rec_packet(struct garmin_data *garmin_data_p, int count)
 		n++;
 	}
 
-	if ((0xff & (cksum + *recpkt)) != 0) {
+	if (((cksum + *recpkt) & 0xff) != 0) {
 		dev_dbg(dev, "%s - invalid checksum, expected %02x, got %02x\n",
-			__func__, 0xff & -cksum, 0xff & *recpkt);
+			__func__, -cksum & 0xff, *recpkt & 0xff);
 		return -EINVPKT;
 	}
 
@@ -528,7 +528,7 @@ static int gsp_receive(struct garmin_data *garmin_data_p,
 					dev_dbg(dev, "NAK packet complete.\n");
 				} else {
 					dev_dbg(dev, "packet complete - id=0x%X.\n",
-						0xFF & data);
+							data & 0xFF);
 					gsp_rec_packet(garmin_data_p, size);
 				}
 
@@ -636,7 +636,7 @@ static int gsp_send(struct garmin_data *garmin_data_p,
 
 	garmin_data_p->outsize = 0;
 
-	if (GARMIN_LAYERID_APPL != getLayerId(garmin_data_p->outbuffer)) {
+	if (getLayerId(garmin_data_p->outbuffer) != GARMIN_LAYERID_APPL) {
 		dev_dbg(dev, "not an application packet (%d)\n",
 				getLayerId(garmin_data_p->outbuffer));
 		return -1;
@@ -688,7 +688,7 @@ static int gsp_send(struct garmin_data *garmin_data_p,
 			*dst++ = DLE;
 	}
 
-	cksum = 0xFF & -cksum;
+	cksum = -cksum & 0xFF;
 	*dst++ = cksum;
 	if (cksum == DLE)
 		*dst++ = DLE;
@@ -970,7 +970,7 @@ static void garmin_write_bulk_callback(struct urb *urb)
 		struct garmin_data *garmin_data_p =
 					usb_get_serial_port_data(port);
 
-		if (GARMIN_LAYERID_APPL == getLayerId(urb->transfer_buffer)) {
+		if (getLayerId(urb->transfer_buffer) == GARMIN_LAYERID_APPL) {
 
 			if (garmin_data_p->mode == MODE_GARMIN_SERIAL) {
 				gsp_send_ack(garmin_data_p,
@@ -1025,7 +1025,7 @@ static int garmin_write_bulk(struct usb_serial_port *port,
 				dismiss_ack ? NULL : port);
 	urb->transfer_flags |= URB_ZERO_PACKET;
 
-	if (GARMIN_LAYERID_APPL == getLayerId(buffer)) {
+	if (getLayerId(buffer) == GARMIN_LAYERID_APPL) {
 
 		spin_lock_irqsave(&garmin_data_p->lock, flags);
 		garmin_data_p->flags |= APP_REQ_SEEN;
@@ -1077,9 +1077,9 @@ static int garmin_write(struct tty_struct *tty, struct usb_serial_port *port,
 		pktsiz = getDataLength(garmin_data_p->privpkt);
 		pktid  = getPacketId(garmin_data_p->privpkt);
 
-		if (count == (GARMIN_PKTHDR_LENGTH+pktsiz)
-		    && GARMIN_LAYERID_PRIVATE ==
-				getLayerId(garmin_data_p->privpkt)) {
+		if ((GARMIN_PKTHDR_LENGTH+pktsiz) == count &&
+			getLayerId(garmin_data_p->privpkt) ==
+				GARMIN_LAYERID_PRIVATE) {
 
 			dev_dbg(dev, "%s - processing private request %d\n",
 				__func__, pktid);
@@ -1192,7 +1192,7 @@ static void garmin_read_bulk_callback(struct urb *urb)
 	garmin_read_process(garmin_data_p, data, urb->actual_length, 1);
 
 	if (urb->actual_length == 0 &&
-			0 != (garmin_data_p->flags & FLAGS_BULK_IN_RESTART)) {
+			(garmin_data_p->flags & FLAGS_BULK_IN_RESTART) != 0) {
 		spin_lock_irqsave(&garmin_data_p->lock, flags);
 		garmin_data_p->flags &= ~FLAGS_BULK_IN_RESTART;
 		spin_unlock_irqrestore(&garmin_data_p->lock, flags);
@@ -1203,7 +1203,7 @@ static void garmin_read_bulk_callback(struct urb *urb)
 				__func__, retval);
 	} else if (urb->actual_length > 0) {
 		/* Continue trying to read until nothing more is received  */
-		if (0 == (garmin_data_p->flags & FLAGS_THROTTLED)) {
+		if ((garmin_data_p->flags & FLAGS_THROTTLED) == 0) {
 			retval = usb_submit_urb(port->read_urb, GFP_ATOMIC);
 			if (retval)
 				dev_err(&port->dev,
@@ -1249,12 +1249,12 @@ static void garmin_read_int_callback(struct urb *urb)
 			      urb->transfer_buffer);
 
 	if (urb->actual_length == sizeof(GARMIN_BULK_IN_AVAIL_REPLY) &&
-	    0 == memcmp(data, GARMIN_BULK_IN_AVAIL_REPLY,
-				sizeof(GARMIN_BULK_IN_AVAIL_REPLY))) {
+		memcmp(data, GARMIN_BULK_IN_AVAIL_REPLY,
+				sizeof(GARMIN_BULK_IN_AVAIL_REPLY)) == 0) {
 
 		dev_dbg(&port->dev, "%s - bulk data available.\n", __func__);
 
-		if (0 == (garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE)) {
+		if ((garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE) == 0) {
 
 			/* bulk data available */
 			retval = usb_submit_urb(port->read_urb, GFP_ATOMIC);
@@ -1276,8 +1276,8 @@ static void garmin_read_int_callback(struct urb *urb)
 		}
 
 	} else if (urb->actual_length == (4+sizeof(GARMIN_START_SESSION_REPLY))
-			 && 0 == memcmp(data, GARMIN_START_SESSION_REPLY,
-					sizeof(GARMIN_START_SESSION_REPLY))) {
+			 && memcmp(data, GARMIN_START_SESSION_REPLY,
+				 sizeof(GARMIN_START_SESSION_REPLY)) == 0) {
 
 		spin_lock_irqsave(&garmin_data_p->lock, flags);
 		garmin_data_p->flags |= FLAGS_SESSION_REPLY1_SEEN;
@@ -1356,7 +1356,7 @@ static void garmin_unthrottle(struct tty_struct *tty)
 	if (garmin_data_p->mode == MODE_NATIVE)
 		garmin_flush_queue(garmin_data_p);
 
-	if (0 != (garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE)) {
+	if ((garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE) != 0) {
 		status = usb_submit_urb(port->read_urb, GFP_KERNEL);
 		if (status)
 			dev_err(&port->dev,
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322462 — [PATCH 02/14] USB: serial: safe_serial: fix assignment of bool to non 0/1 constant

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 02/14] USB: serial: safe_serial: fix assignment of bool to non 0/1 constant
Message-ID<qWHOP-7mY-29@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle error:

drivers/usb/serial/safe_serial.c:85:12-18: ERROR: Assignment of bool to non-0/1 constant

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/safe_serial.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 5662df6..93c6c9b 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -76,13 +76,8 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
-
-#ifndef CONFIG_USB_SERIAL_SAFE_PADDED
-#define CONFIG_USB_SERIAL_SAFE_PADDED 0
-#endif
-
 static bool safe = true;
-static bool padded = CONFIG_USB_SERIAL_SAFE_PADDED;
+static bool padded = IS_ENABLED(CONFIG_USB_SERIAL_SAFE_PADDED);
 
 #define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com, Johan Hovold <jhovold@gmail.com>"
 #define DRIVER_DESC "USB Safe Encapsulated Serial"
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322463 — [PATCH 05/14] USB: serial: mos7840: remove comparison to bool

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 05/14] USB: serial: mos7840: remove comparison to bool
Message-ID<qWHOP-7mY-31@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warning:

drivers/usb/serial/mos7840.c:1845:5-32: WARNING: Comparison to bool
drivers/usb/serial/mos7840.c:1909:5-32: WARNING: Comparison to bool

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/mos7840.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 2c69bfc..8ddc313 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1842,7 +1842,7 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
 	Data = 0x0c;
 	mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
 
-	if (mos7840_port->read_urb_busy == false) {
+	if (!mos7840_port->read_urb_busy) {
 		mos7840_port->read_urb_busy = true;
 		status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL);
 		if (status) {
@@ -1906,7 +1906,7 @@ static void mos7840_set_termios(struct tty_struct *tty,
 		return;
 	}
 
-	if (mos7840_port->read_urb_busy == false) {
+	if (!mos7840_port->read_urb_busy) {
 		mos7840_port->read_urb_busy = true;
 		status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL);
 		if (status) {
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322464 — [PATCH 13/14] USB: serial: f81232: move constants to right

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 13/14] USB: serial: f81232: move constants to right
Message-ID<qWHOP-7mY-33@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warning:

drivers/usb/serial/f81232.c:193:7-20: Move constant to right.

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/f81232.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 972f5a5..589d856 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -190,7 +190,7 @@ static int f81232_set_mctrl(struct usb_serial_port *port,
 
 	/* force enable interrupt with OUT2 */
 	mutex_lock(&priv->lock);
-	val = UART_MCR_OUT2 | priv->modem_control;
+	val = priv->modem_control | UART_MCR_OUT2;
 
 	if (clear & TIOCM_DTR)
 		val &= ~UART_MCR_DTR;
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322465 — [PATCH 03/14] USB: serial: quatech2: remove comparison to bool

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 03/14] USB: serial: quatech2: remove comparison to bool
Message-ID<qWHOP-7mY-37@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warning:

drivers/usb/serial/quatech2.c:976:5-26: WARNING: Comparison to bool

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/quatech2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 504f5bf..2df8ad5 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -973,7 +973,7 @@ static int qt2_write(struct tty_struct *tty,
 
 	data = write_urb->transfer_buffer;
 	spin_lock_irqsave(&port_priv->urb_lock, flags);
-	if (port_priv->urb_in_use == true) {
+	if (port_priv->urb_in_use) {
 		dev_err(&port->dev, "qt2_write - urb is in use\n");
 		goto write_out;
 	}
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322466 — [PATCH 11/14] USB: serial: mos7840: move constants to right

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 11/14] USB: serial: mos7840: move constants to right
Message-ID<qWHOP-7mY-39@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warnings:

drivers/usb/serial/mos7840.c:2042:4-10: Move constant to right.
drivers/usb/serial/mos7840.c:2062:16-22: Move constant to right.

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/mos7840.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 8ddc313..982a3fb 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2039,7 +2039,7 @@ static int mos7810_check(struct usb_serial *serial)
 		/* Send the 1-bit test pattern out to MCS7810 test pin */
 		usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
 			MCS_WRREQ, MCS_WR_RTYPE,
-			(0x0300 | (((test_pattern >> i) & 0x0001) << 1)),
+			((((test_pattern >> i) & 0x0001) << 1) | 0x0300),
 			MODEM_CONTROL_REGISTER, NULL, 0, MOS_WDR_TIMEOUT);
 
 		/* Read the test pattern back */
@@ -2059,7 +2059,7 @@ static int mos7810_check(struct usb_serial *serial)
 
 	/* Restore MCR setting */
 	usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), MCS_WRREQ,
-		MCS_WR_RTYPE, 0x0300 | mcr_data, MODEM_CONTROL_REGISTER, NULL,
+		MCS_WR_RTYPE, mcr_data | 0x0300, MODEM_CONTROL_REGISTER, NULL,
 		0, MOS_WDR_TIMEOUT);
 
 	kfree(buf);
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322742 — Re: [PATCH 11/14] USB: serial: mos7840: move constants to right

FromBjørn Mork <bjorn@mork.no>
Date2016-01-31 22:40 +0100
SubjectRe: [PATCH 11/14] USB: serial: mos7840: move constants to right
Message-ID<qX7SW-Rd-17@gated-at.bofh.it>
In reply to#1322466
Mathieu OTHACEHE <m.othacehe@gmail.com> writes:

> This patch fixes the following coccinelle warnings:
>
> drivers/usb/serial/mos7840.c:2042:4-10: Move constant to right.
> drivers/usb/serial/mos7840.c:2062:16-22: Move constant to right.
>
> Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
> ---
>  drivers/usb/serial/mos7840.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
> index 8ddc313..982a3fb 100644
> --- a/drivers/usb/serial/mos7840.c
> +++ b/drivers/usb/serial/mos7840.c
> @@ -2039,7 +2039,7 @@ static int mos7810_check(struct usb_serial *serial)
>  		/* Send the 1-bit test pattern out to MCS7810 test pin */
>  		usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
>  			MCS_WRREQ, MCS_WR_RTYPE,
> -			(0x0300 | (((test_pattern >> i) & 0x0001) << 1)),
> +			((((test_pattern >> i) & 0x0001) << 1) | 0x0300),
>  			MODEM_CONTROL_REGISTER, NULL, 0, MOS_WDR_TIMEOUT);
>  
>  		/* Read the test pattern back */
> @@ -2059,7 +2059,7 @@ static int mos7810_check(struct usb_serial *serial)
>  
>  	/* Restore MCR setting */
>  	usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), MCS_WRREQ,
> -		MCS_WR_RTYPE, 0x0300 | mcr_data, MODEM_CONTROL_REGISTER, NULL,
> +		MCS_WR_RTYPE, mcr_data | 0x0300, MODEM_CONTROL_REGISTER, NULL,
>  		0, MOS_WDR_TIMEOUT);
>  
>  	kfree(buf);

I feel I'm missing something here, so I have to ask the stupid question:
What could possibly be the benefit here?  Is it faster? Safer?  Easier
to read?



Bjørn

[toc] | [prev] | [next] | [standalone]

#1323028 — Re: [PATCH 11/14] USB: serial: mos7840: move constants to right

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-02-01 13:00 +0100
SubjectRe: [PATCH 11/14] USB: serial: mos7840: move constants to right
Message-ID<qXljb-25A-5@gated-at.bofh.it>
In reply to#1322742
On Sun, Jan 31, 2016 at 10:33:54PM +0100, Bjørn Mork wrote:
> Mathieu OTHACEHE <m.othacehe@gmail.com> writes:
> 
> > This patch fixes the following coccinelle warnings:
> >
> > drivers/usb/serial/mos7840.c:2042:4-10: Move constant to right.
> > drivers/usb/serial/mos7840.c:2062:16-22: Move constant to right.
> >
> > Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
> > ---
> >  drivers/usb/serial/mos7840.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
> > index 8ddc313..982a3fb 100644
> > --- a/drivers/usb/serial/mos7840.c
> > +++ b/drivers/usb/serial/mos7840.c
> > @@ -2039,7 +2039,7 @@ static int mos7810_check(struct usb_serial *serial)
> >  		/* Send the 1-bit test pattern out to MCS7810 test pin */
> >  		usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
> >  			MCS_WRREQ, MCS_WR_RTYPE,
> > -			(0x0300 | (((test_pattern >> i) & 0x0001) << 1)),
> > +			((((test_pattern >> i) & 0x0001) << 1) | 0x0300),
> >  			MODEM_CONTROL_REGISTER, NULL, 0, MOS_WDR_TIMEOUT);
> >  
> >  		/* Read the test pattern back */
> > @@ -2059,7 +2059,7 @@ static int mos7810_check(struct usb_serial *serial)
> >  
> >  	/* Restore MCR setting */
> >  	usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), MCS_WRREQ,
> > -		MCS_WR_RTYPE, 0x0300 | mcr_data, MODEM_CONTROL_REGISTER, NULL,
> > +		MCS_WR_RTYPE, mcr_data | 0x0300, MODEM_CONTROL_REGISTER, NULL,
> >  		0, MOS_WDR_TIMEOUT);
> >  
> >  	kfree(buf);
> 
> I feel I'm missing something here, so I have to ask the stupid question:
> What could possibly be the benefit here?  Is it faster? Safer?  Easier
> to read?

I don't think it will be faster or safer, maybe easier to read. But the point is to remove the
warnings produced by the file scripts/coccinelle/misc/compare_const_fl.cocci when
running make coccicheck.

> 
> 
> 
> Bjørn

[toc] | [prev] | [next] | [standalone]

#1323054 — Re: [PATCH 11/14] USB: serial: mos7840: move constants to right

FromBjørn Mork <bjorn@mork.no>
Date2016-02-01 13:40 +0100
SubjectRe: [PATCH 11/14] USB: serial: mos7840: move constants to right
Message-ID<qXlVT-2IS-1@gated-at.bofh.it>
In reply to#1323028
Mathieu OTHACEHE <m.othacehe@gmail.com> writes:
> On Sun, Jan 31, 2016 at 10:33:54PM +0100, Bjørn Mork wrote:
>
>> I feel I'm missing something here, so I have to ask the stupid question:
>> What could possibly be the benefit here?  Is it faster? Safer?  Easier
>> to read?
>
> I don't think it will be faster or safer, maybe easier to read. But the point is to remove the
> warnings produced by the file scripts/coccinelle/misc/compare_const_fl.cocci when
> running make coccicheck.

Making a tool happy is never going to be a valid reason for anything.
If it were, then you would not be necessary...

Luckily you still are. Your task is adding some intelligence to the
output of the script.  That means that you should look at the output and
describe how it improves the code in a way that makes me understand it.
And I can be pretty slow :)

If you can't do that, then there is a high probability that the script
didn't improve anything.


Bjørn

[toc] | [prev] | [next] | [standalone]

#1322467 — [PATCH 10/14] USB: serial: garmin_gps: remove unneeded variable

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 10/14] USB: serial: garmin_gps: remove unneeded variable
Message-ID<qWHOP-7mY-41@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warning:

drivers/usb/serial/garmin_gps.c:863:5-11: Unneeded variable:
"status". Return "0" on line 873

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/garmin_gps.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index c0bbe44..91a9b55 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -860,7 +860,6 @@ static int process_resetdev_request(struct usb_serial_port *port)
 static int garmin_clear(struct garmin_data *garmin_data_p)
 {
 	unsigned long flags;
-	int status = 0;
 
 	/* flush all queued data */
 	pkt_clear(garmin_data_p);
@@ -870,7 +869,7 @@ static int garmin_clear(struct garmin_data *garmin_data_p)
 	garmin_data_p->outsize = 0;
 	spin_unlock_irqrestore(&garmin_data_p->lock, flags);
 
-	return status;
+	return 0;
 }
 
 
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322468 — [PATCH 01/14] USB: serial: safe_serial: fix assignment of bool to 0/1

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 01/14] USB: serial: safe_serial: fix assignment of bool to 0/1
Message-ID<qWHOQ-7mY-43@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warnings:

drivers/usb/serial/safe_serial.c:84:12-16: WARNING: Assignment of bool to 0/1
drivers/usb/serial/safe_serial.c:281:2-8: WARNING: Assignment of bool to 0/1

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/safe_serial.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index b2dff0f..5662df6 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -81,7 +81,7 @@
 #define CONFIG_USB_SERIAL_SAFE_PADDED 0
 #endif
 
-static bool safe = 1;
+static bool safe = true;
 static bool padded = CONFIG_USB_SERIAL_SAFE_PADDED;
 
 #define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com, Johan Hovold <jhovold@gmail.com>"
@@ -278,7 +278,7 @@ static int safe_startup(struct usb_serial *serial)
 	case LINEO_SAFESERIAL_CRC:
 		break;
 	case LINEO_SAFESERIAL_CRC_PADDED:
-		padded = 1;
+		padded = true;
 		break;
 	default:
 		return -EINVAL;
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322469 — [PATCH 08/14] USB: serial: keyspan: remove unused semicolon

FromMathieu OTHACEHE <m.othacehe@gmail.com>
Date2016-01-30 18:50 +0100
Subject[PATCH 08/14] USB: serial: keyspan: remove unused semicolon
Message-ID<qWHOQ-7mY-45@gated-at.bofh.it>
In reply to#1322460
This patch fixes the following coccinelle warning:

drivers/usb/serial/keyspan.c:1966:49-50: Unneeded semicolon

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
 drivers/usb/serial/keyspan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index e07b15e..b6bd8e4 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -1963,7 +1963,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
 	if (d_details->product_id == keyspan_usa49wg_product_id) {
 		dr = (void *)(s_priv->ctrl_buf);
 		dr->bRequestType = USB_TYPE_VENDOR | USB_DIR_OUT;
-		dr->bRequest = 0xB0;	/* 49wg control message */;
+		dr->bRequest = 0xB0;	/* 49wg control message */
 		dr->wValue = 0;
 		dr->wIndex = 0;
 		dr->wLength = cpu_to_le16(sizeof(msg));
-- 
2.6.4

[toc] | [prev] | [next] | [standalone]

#1322735

FromJohan Hovold <johan@kernel.org>
Date2016-01-31 21:20 +0100
Message-ID<qX6Dw-5f-21@gated-at.bofh.it>
In reply to#1322460
On Sat, Jan 30, 2016 at 06:44:33PM +0100, Mathieu OTHACEHE wrote:
> This series of patches fixes all coccinelle warnings in
> USB serial subsystem
> 
> Mathieu OTHACEHE (14):
>   USB: serial: safe_serial: fix assignment of bool to 0/1
>   USB: serial: safe_serial: fix assignment of bool to non 0/1 constant
>   USB: serial: quatech2: remove comparison to bool
>   USB: serial: iuu_phoenix: remove comparison of bool
>   USB: serial: mos7840: remove comparison to bool
>   USB: serial: garmin_gps: move constants to right
>   USB: serial: ftdi_sio: move constants to right
>   USB: serial: keyspan: remove unused semicolon
>   USB: serial: cyberjack: remove unneeded variable
>   USB: serial: garmin_gps: remove unneeded variable
>   USB: serial: mos7840: move constants to right
>   USB: serial: ch341: move constants to right
>   USB: serial: f81232: move constants to right
>   USB: serial: kl5kusb105: remove unneeded semicolons

Please squash these per type (or larger class) of issue you're fixing,
at least when the diffs aren't too big. No need to remove two semicolons
in two patches, etc.

Thanks,
Johan

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web