USB: serial: fix compare_const_fl.cocci warnings

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Move constants to the right of binary operators where it increases
readability.

Generated by: scripts/coccinelle/misc/compare_const_fl.cocci

Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
[johan: drop some chunks and fix others, amend commit message ]
Signed-off-by: Johan Hovold <johan@kernel.org>

authored by

Mathieu OTHACEHE and committed by

Johan Hovold 10 years ago fb571101 81f70ba2

+34 -34

4 changed files

expand all

drivers

usb

serial

ch341.c

ftdi_sio.c

ftdi_sio.h

garmin_gps.c

+1 -1

drivers/usb/serial/ch341.c

··· 370 370 static void ch341_break_ctl(struct tty_struct *tty, int break_state) 371 371 { 372 372 const uint16_t ch341_break_reg = 373 - CH341_REG_BREAK1 | ((uint16_t) CH341_REG_BREAK2 << 8); 373 + ((uint16_t) CH341_REG_BREAK2 << 8) | CH341_REG_BREAK1; 374 374 struct usb_serial_port *port = tty->driver_data; 375 375 int r; 376 376 uint16_t reg_contents;

+5 -5

drivers/usb/serial/ftdi_sio.c

··· 1320 1320 if (baud <= 3000000) { 1321 1321 __u16 product_id = le16_to_cpu( 1322 1322 port->serial->dev->descriptor.idProduct); 1323 - if (((FTDI_NDI_HUC_PID == product_id) || 1324 - (FTDI_NDI_SPECTRA_SCU_PID == product_id) || 1325 - (FTDI_NDI_FUTURE_2_PID == product_id) || 1326 - (FTDI_NDI_FUTURE_3_PID == product_id) || 1327 - (FTDI_NDI_AURORA_SCU_PID == product_id)) && 1323 + if (((product_id == FTDI_NDI_HUC_PID) || 1324 + (product_id == FTDI_NDI_SPECTRA_SCU_PID) || 1325 + (product_id == FTDI_NDI_FUTURE_2_PID) || 1326 + (product_id == FTDI_NDI_FUTURE_3_PID) || 1327 + (product_id == FTDI_NDI_AURORA_SCU_PID)) && 1328 1328 (baud == 19200)) { 1329 1329 baud = 1200000; 1330 1330 }

+4 -4

drivers/usb/serial/ftdi_sio.h

··· 239 239 */ 240 240 241 241 #define FTDI_SIO_SET_DTR_MASK 0x1 242 - #define FTDI_SIO_SET_DTR_HIGH (1 | (FTDI_SIO_SET_DTR_MASK << 8)) 243 - #define FTDI_SIO_SET_DTR_LOW (0 | (FTDI_SIO_SET_DTR_MASK << 8)) 242 + #define FTDI_SIO_SET_DTR_HIGH ((FTDI_SIO_SET_DTR_MASK << 8) | 1) 243 + #define FTDI_SIO_SET_DTR_LOW ((FTDI_SIO_SET_DTR_MASK << 8) | 0) 244 244 #define FTDI_SIO_SET_RTS_MASK 0x2 245 - #define FTDI_SIO_SET_RTS_HIGH (2 | (FTDI_SIO_SET_RTS_MASK << 8)) 246 - #define FTDI_SIO_SET_RTS_LOW (0 | (FTDI_SIO_SET_RTS_MASK << 8)) 245 + #define FTDI_SIO_SET_RTS_HIGH ((FTDI_SIO_SET_RTS_MASK << 8) | 2) 246 + #define FTDI_SIO_SET_RTS_LOW ((FTDI_SIO_SET_RTS_MASK << 8) | 0) 247 247 248 248 /* 249 249 * ControlValue

+24 -24

drivers/usb/serial/garmin_gps.c

··· 237 237 */ 238 238 static inline int isAbortTrfCmnd(const unsigned char *buf) 239 239 { 240 - if (0 == memcmp(buf, GARMIN_STOP_TRANSFER_REQ, 241 - sizeof(GARMIN_STOP_TRANSFER_REQ)) || 242 - 0 == memcmp(buf, GARMIN_STOP_TRANSFER_REQ_V2, 243 - sizeof(GARMIN_STOP_TRANSFER_REQ_V2))) 240 + if (memcmp(buf, GARMIN_STOP_TRANSFER_REQ, 241 + sizeof(GARMIN_STOP_TRANSFER_REQ)) == 0 || 242 + memcmp(buf, GARMIN_STOP_TRANSFER_REQ_V2, 243 + sizeof(GARMIN_STOP_TRANSFER_REQ_V2)) == 0) 244 244 return 1; 245 245 else 246 246 return 0; ··· 350 350 unsigned l = 0; 351 351 352 352 dev_dbg(&garmin_data_p->port->dev, "%s - pkt-id: 0x%X.\n", __func__, 353 - 0xFF & pkt_id); 353 + pkt_id); 354 354 355 355 *ptr++ = DLE; 356 356 *ptr++ = ACK; ··· 366 366 *ptr++ = DLE; 367 367 368 368 *ptr++ = 0; 369 - *ptr++ = 0xFF & (-cksum); 369 + *ptr++ = (-cksum) & 0xFF; 370 370 *ptr++ = DLE; 371 371 *ptr++ = ETX; 372 372 ··· 423 423 n++; 424 424 } 425 425 426 - if ((0xff & (cksum + *recpkt)) != 0) { 426 + if (((cksum + *recpkt) & 0xff) != 0) { 427 427 dev_dbg(dev, "%s - invalid checksum, expected %02x, got %02x\n", 428 - __func__, 0xff & -cksum, 0xff & *recpkt); 428 + __func__, -cksum & 0xff, *recpkt); 429 429 return -EINVPKT; 430 430 } 431 431 ··· 528 528 dev_dbg(dev, "NAK packet complete.\n"); 529 529 } else { 530 530 dev_dbg(dev, "packet complete - id=0x%X.\n", 531 - 0xFF & data); 531 + data); 532 532 gsp_rec_packet(garmin_data_p, size); 533 533 } 534 534 ··· 636 636 637 637 garmin_data_p->outsize = 0; 638 638 639 - if (GARMIN_LAYERID_APPL != getLayerId(garmin_data_p->outbuffer)) { 639 + if (getLayerId(garmin_data_p->outbuffer) != GARMIN_LAYERID_APPL) { 640 640 dev_dbg(dev, "not an application packet (%d)\n", 641 641 getLayerId(garmin_data_p->outbuffer)); 642 642 return -1; ··· 688 688 *dst++ = DLE; 689 689 } 690 690 691 - cksum = 0xFF & -cksum; 691 + cksum = -cksum & 0xFF; 692 692 *dst++ = cksum; 693 693 if (cksum == DLE) 694 694 *dst++ = DLE; ··· 970 970 struct garmin_data *garmin_data_p = 971 971 usb_get_serial_port_data(port); 972 972 973 - if (GARMIN_LAYERID_APPL == getLayerId(urb->transfer_buffer)) { 973 + if (getLayerId(urb->transfer_buffer) == GARMIN_LAYERID_APPL) { 974 974 975 975 if (garmin_data_p->mode == MODE_GARMIN_SERIAL) { 976 976 gsp_send_ack(garmin_data_p, ··· 1025 1025 dismiss_ack ? NULL : port); 1026 1026 urb->transfer_flags |= URB_ZERO_PACKET; 1027 1027 1028 - if (GARMIN_LAYERID_APPL == getLayerId(buffer)) { 1028 + if (getLayerId(buffer) == GARMIN_LAYERID_APPL) { 1029 1029 1030 1030 spin_lock_irqsave(&garmin_data_p->lock, flags); 1031 1031 garmin_data_p->flags |= APP_REQ_SEEN; ··· 1077 1077 pktsiz = getDataLength(garmin_data_p->privpkt); 1078 1078 pktid = getPacketId(garmin_data_p->privpkt); 1079 1079 1080 - if (count == (GARMIN_PKTHDR_LENGTH+pktsiz) 1081 - && GARMIN_LAYERID_PRIVATE == 1082 - getLayerId(garmin_data_p->privpkt)) { 1080 + if (count == (GARMIN_PKTHDR_LENGTH + pktsiz) && 1081 + getLayerId(garmin_data_p->privpkt) == 1082 + GARMIN_LAYERID_PRIVATE) { 1083 1083 1084 1084 dev_dbg(dev, "%s - processing private request %d\n", 1085 1085 __func__, pktid); ··· 1192 1192 garmin_read_process(garmin_data_p, data, urb->actual_length, 1); 1193 1193 1194 1194 if (urb->actual_length == 0 && 1195 - 0 != (garmin_data_p->flags & FLAGS_BULK_IN_RESTART)) { 1195 + (garmin_data_p->flags & FLAGS_BULK_IN_RESTART) != 0) { 1196 1196 spin_lock_irqsave(&garmin_data_p->lock, flags); 1197 1197 garmin_data_p->flags &= ~FLAGS_BULK_IN_RESTART; 1198 1198 spin_unlock_irqrestore(&garmin_data_p->lock, flags); ··· 1203 1203 __func__, retval); 1204 1204 } else if (urb->actual_length > 0) { 1205 1205 /* Continue trying to read until nothing more is received */ 1206 - if (0 == (garmin_data_p->flags & FLAGS_THROTTLED)) { 1206 + if ((garmin_data_p->flags & FLAGS_THROTTLED) == 0) { 1207 1207 retval = usb_submit_urb(port->read_urb, GFP_ATOMIC); 1208 1208 if (retval) 1209 1209 dev_err(&port->dev, ··· 1249 1249 urb->transfer_buffer); 1250 1250 1251 1251 if (urb->actual_length == sizeof(GARMIN_BULK_IN_AVAIL_REPLY) && 1252 - 0 == memcmp(data, GARMIN_BULK_IN_AVAIL_REPLY, 1253 - sizeof(GARMIN_BULK_IN_AVAIL_REPLY))) { 1252 + memcmp(data, GARMIN_BULK_IN_AVAIL_REPLY, 1253 + sizeof(GARMIN_BULK_IN_AVAIL_REPLY)) == 0) { 1254 1254 1255 1255 dev_dbg(&port->dev, "%s - bulk data available.\n", __func__); 1256 1256 1257 - if (0 == (garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE)) { 1257 + if ((garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE) == 0) { 1258 1258 1259 1259 /* bulk data available */ 1260 1260 retval = usb_submit_urb(port->read_urb, GFP_ATOMIC); ··· 1276 1276 } 1277 1277 1278 1278 } else if (urb->actual_length == (4+sizeof(GARMIN_START_SESSION_REPLY)) 1279 - && 0 == memcmp(data, GARMIN_START_SESSION_REPLY, 1280 - sizeof(GARMIN_START_SESSION_REPLY))) { 1279 + && memcmp(data, GARMIN_START_SESSION_REPLY, 1280 + sizeof(GARMIN_START_SESSION_REPLY)) == 0) { 1281 1281 1282 1282 spin_lock_irqsave(&garmin_data_p->lock, flags); 1283 1283 garmin_data_p->flags |= FLAGS_SESSION_REPLY1_SEEN; ··· 1356 1356 if (garmin_data_p->mode == MODE_NATIVE) 1357 1357 garmin_flush_queue(garmin_data_p); 1358 1358 1359 - if (0 != (garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE)) { 1359 + if ((garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE) != 0) { 1360 1360 status = usb_submit_urb(port->read_urb, GFP_KERNEL); 1361 1361 if (status) 1362 1362 dev_err(&port->dev,