Commit ce9d8562 authored by Mathieu OTHACEHE's avatar Mathieu OTHACEHE Committed by Johan Hovold

USB: serial: fix boolinit.cocci warnings

Bool initializations should use true and false. Bool tests don't need
comparisons.

Also, use IS_ENABLED instead of ifdef.

Generated by: scripts/coccinelle/misc/boolinit.cocci
Signed-off-by: default avatarMathieu OTHACEHE <m.othacehe@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 0f3083af
...@@ -360,7 +360,7 @@ static void iuu_led_activity_on(struct urb *urb) ...@@ -360,7 +360,7 @@ static void iuu_led_activity_on(struct urb *urb)
int result; int result;
char *buf_ptr = port->write_urb->transfer_buffer; char *buf_ptr = port->write_urb->transfer_buffer;
*buf_ptr++ = IUU_SET_LED; *buf_ptr++ = IUU_SET_LED;
if (xmas == 1) { if (xmas) {
get_random_bytes(buf_ptr, 6); get_random_bytes(buf_ptr, 6);
*(buf_ptr+7) = 1; *(buf_ptr+7) = 1;
} else { } else {
...@@ -380,7 +380,7 @@ static void iuu_led_activity_off(struct urb *urb) ...@@ -380,7 +380,7 @@ static void iuu_led_activity_off(struct urb *urb)
struct usb_serial_port *port = urb->context; struct usb_serial_port *port = urb->context;
int result; int result;
char *buf_ptr = port->write_urb->transfer_buffer; char *buf_ptr = port->write_urb->transfer_buffer;
if (xmas == 1) { if (xmas) {
iuu_rxcmd(urb); iuu_rxcmd(urb);
return; return;
} else { } else {
......
...@@ -1842,7 +1842,7 @@ static void mos7840_change_port_settings(struct tty_struct *tty, ...@@ -1842,7 +1842,7 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
Data = 0x0c; Data = 0x0c;
mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data); 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; mos7840_port->read_urb_busy = true;
status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL); status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL);
if (status) { if (status) {
...@@ -1906,7 +1906,7 @@ static void mos7840_set_termios(struct tty_struct *tty, ...@@ -1906,7 +1906,7 @@ static void mos7840_set_termios(struct tty_struct *tty,
return; return;
} }
if (mos7840_port->read_urb_busy == false) { if (!mos7840_port->read_urb_busy) {
mos7840_port->read_urb_busy = true; mos7840_port->read_urb_busy = true;
status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL); status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL);
if (status) { if (status) {
......
...@@ -973,7 +973,7 @@ static int qt2_write(struct tty_struct *tty, ...@@ -973,7 +973,7 @@ static int qt2_write(struct tty_struct *tty,
data = write_urb->transfer_buffer; data = write_urb->transfer_buffer;
spin_lock_irqsave(&port_priv->urb_lock, flags); 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"); dev_err(&port->dev, "qt2_write - urb is in use\n");
goto write_out; goto write_out;
} }
......
...@@ -76,13 +76,8 @@ ...@@ -76,13 +76,8 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/serial.h> #include <linux/usb/serial.h>
static bool safe = true;
#ifndef CONFIG_USB_SERIAL_SAFE_PADDED static bool padded = IS_ENABLED(CONFIG_USB_SERIAL_SAFE_PADDED);
#define CONFIG_USB_SERIAL_SAFE_PADDED 0
#endif
static bool safe = 1;
static bool padded = CONFIG_USB_SERIAL_SAFE_PADDED;
#define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com, Johan Hovold <jhovold@gmail.com>" #define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com, Johan Hovold <jhovold@gmail.com>"
#define DRIVER_DESC "USB Safe Encapsulated Serial" #define DRIVER_DESC "USB Safe Encapsulated Serial"
...@@ -278,7 +273,7 @@ static int safe_startup(struct usb_serial *serial) ...@@ -278,7 +273,7 @@ static int safe_startup(struct usb_serial *serial)
case LINEO_SAFESERIAL_CRC: case LINEO_SAFESERIAL_CRC:
break; break;
case LINEO_SAFESERIAL_CRC_PADDED: case LINEO_SAFESERIAL_CRC_PADDED:
padded = 1; padded = true;
break; break;
default: default:
return -EINVAL; return -EINVAL;
......
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