From: Mathieu OTHACEHE <m.othacehe@gmail.com>
To: johan@kernel.org, gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
Mathieu OTHACEHE <m.othacehe@gmail.com>
Subject: [PATCH 07/14] USB: serial: ftdi_sio: move constants to right
Date: Sat, 30 Jan 2016 18:44:40 +0100 [thread overview]
Message-ID: <1454175887-16158-8-git-send-email-m.othacehe@gmail.com> (raw)
In-Reply-To: <1454175887-16158-1-git-send-email-m.othacehe@gmail.com>
This patch fixes the following coccinelle warnings:
drivers/usb/serial/ftdi_sio.h:242:31-32: Move constant to right.
drivers/usb/serial/ftdi_sio.h:243:31-32: Move constant to right.
drivers/usb/serial/ftdi_sio.h:245:31-32: Move constant to right.
drivers/usb/serial/ftdi_sio.h:246:30-31: Move constant to right.
drivers/usb/serial/ftdi_sio.c:2327:13-32: Move constant to right.
drivers/usb/serial/ftdi_sio.c:2356:22-42: Move constant to right.
drivers/usb/serial/ftdi_sio.c:1322:9-25: Move constant to right.
drivers/usb/serial/ftdi_sio.c:1323:9-33: Move constant to right.
drivers/usb/serial/ftdi_sio.c:1324:9-30: Move constant to right.
drivers/usb/serial/ftdi_sio.c:1325:9-30: Move constant to right.
drivers/usb/serial/ftdi_sio.c:1326:9-32: Move constant to right.
Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
drivers/usb/serial/ftdi_sio.c | 16 ++++++++--------
drivers/usb/serial/ftdi_sio.h | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 8c660ae..07b0040 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1320,11 +1320,11 @@ static __u32 get_ftdi_divisor(struct tty_struct *tty,
if (baud <= 3000000) {
__u16 product_id = le16_to_cpu(
port->serial->dev->descriptor.idProduct);
- if (((FTDI_NDI_HUC_PID == product_id) ||
- (FTDI_NDI_SPECTRA_SCU_PID == product_id) ||
- (FTDI_NDI_FUTURE_2_PID == product_id) ||
- (FTDI_NDI_FUTURE_3_PID == product_id) ||
- (FTDI_NDI_AURORA_SCU_PID == product_id)) &&
+ if (((product_id == FTDI_NDI_HUC_PID) ||
+ (product_id == FTDI_NDI_SPECTRA_SCU_PID) ||
+ (product_id == FTDI_NDI_FUTURE_2_PID) ||
+ (product_id == FTDI_NDI_FUTURE_3_PID) ||
+ (product_id == FTDI_NDI_AURORA_SCU_PID)) &&
(baud == 19200)) {
baud = 1200000;
}
@@ -2325,7 +2325,7 @@ no_c_cflag_changes:
usb_sndctrlpipe(dev, 0),
FTDI_SIO_SET_FLOW_CTRL_REQUEST,
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
- 0 , (FTDI_SIO_RTS_CTS_HS | priv->interface),
+ 0, (priv->interface | FTDI_SIO_RTS_CTS_HS),
NULL, 0, WDR_TIMEOUT) < 0) {
dev_err(ddev, "urb failed to set to rts/cts flow control\n");
}
@@ -2354,8 +2354,8 @@ no_c_cflag_changes:
usb_sndctrlpipe(dev, 0),
FTDI_SIO_SET_FLOW_CTRL_REQUEST,
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
- urb_value , (FTDI_SIO_XON_XOFF_HS
- | priv->interface),
+ urb_value, (priv->interface |
+ FTDI_SIO_XON_XOFF_HS),
NULL, 0, WDR_TIMEOUT) < 0) {
dev_err(&port->dev, "urb failed to set to "
"xon/xoff flow control\n");
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index ed58c6f..bbcc13df 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -239,11 +239,11 @@ enum ftdi_sio_baudrate {
*/
#define FTDI_SIO_SET_DTR_MASK 0x1
-#define FTDI_SIO_SET_DTR_HIGH (1 | (FTDI_SIO_SET_DTR_MASK << 8))
-#define FTDI_SIO_SET_DTR_LOW (0 | (FTDI_SIO_SET_DTR_MASK << 8))
+#define FTDI_SIO_SET_DTR_HIGH ((FTDI_SIO_SET_DTR_MASK << 8) | 1)
+#define FTDI_SIO_SET_DTR_LOW ((FTDI_SIO_SET_DTR_MASK << 8) | 0)
#define FTDI_SIO_SET_RTS_MASK 0x2
-#define FTDI_SIO_SET_RTS_HIGH (2 | (FTDI_SIO_SET_RTS_MASK << 8))
-#define FTDI_SIO_SET_RTS_LOW (0 | (FTDI_SIO_SET_RTS_MASK << 8))
+#define FTDI_SIO_SET_RTS_HIGH ((FTDI_SIO_SET_RTS_MASK << 8) | 2)
+#define FTDI_SIO_SET_RTS_LOW ((FTDI_SIO_SET_RTS_MASK << 8) | 0)
/*
* ControlValue
--
2.6.4
next prev parent reply other threads:[~2016-01-30 17:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-30 17:44 [PATCH 00/14] USB: serial: Fix coccinelle warnings Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 01/14] USB: serial: safe_serial: fix assignment of bool to 0/1 Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 02/14] USB: serial: safe_serial: fix assignment of bool to non 0/1 constant Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 03/14] USB: serial: quatech2: remove comparison to bool Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 04/14] USB: serial: iuu_phoenix: remove comparison of bool Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 05/14] USB: serial: mos7840: remove comparison to bool Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 06/14] USB: serial: garmin_gps: move constants to right Mathieu OTHACEHE
2016-01-30 17:44 ` Mathieu OTHACEHE [this message]
2016-01-30 17:44 ` [PATCH 08/14] USB: serial: keyspan: remove unused semicolon Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 09/14] USB: serial: cyberjack: remove unneeded variable Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 10/14] USB: serial: garmin_gps: " Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 11/14] USB: serial: mos7840: move constants to right Mathieu OTHACEHE
2016-01-31 21:33 ` Bjørn Mork
2016-02-01 11:57 ` Mathieu OTHACEHE
2016-02-01 12:37 ` Bjørn Mork
2016-02-28 12:46 ` Johan Hovold
2016-01-30 17:44 ` [PATCH 12/14] USB: serial: ch341: " Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 13/14] USB: serial: f81232: " Mathieu OTHACEHE
2016-01-30 17:44 ` [PATCH 14/14] USB: serial: kl5kusb105: remove unneeded semicolons Mathieu OTHACEHE
2016-01-31 20:10 ` [PATCH 00/14] USB: serial: Fix coccinelle warnings Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454175887-16158-8-git-send-email-m.othacehe@gmail.com \
--to=m.othacehe@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome