leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: serial: keyspan_pda: use BIT() macro

Browse Source 
Use the BIT() macro instead of open coding.

Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold
2020-10-25 18:45:59 +01:00
parent 491d6927f0
commit fbbf41f64a
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/usb/serial/keyspan_pda.c
View File

@@ -422,13 +422,14 @@ static int keyspan_pda_tiocmget(struct tty_struct *tty)
rc = keyspan_pda_get_modem_info(serial, &status); rc = keyspan_pda_get_modem_info(serial, &status);
if (rc < 0) if (rc < 0)
return rc; return rc;
value =
((status & (1<<7)) ? TIOCM_DTR : 0) | value = ((status & BIT(7)) ? TIOCM_DTR : 0) |
((status & (1<<6)) ? TIOCM_CAR : 0) | ((status & BIT(6)) ? TIOCM_CAR : 0) |
((status & (1<<5)) ? TIOCM_RNG : 0) | ((status & BIT(5)) ? TIOCM_RNG : 0) |
((status & (1<<4)) ? TIOCM_DSR : 0) | ((status & BIT(4)) ? TIOCM_DSR : 0) |
((status & (1<<3)) ? TIOCM_CTS : 0) | ((status & BIT(3)) ? TIOCM_CTS : 0) |
((status & (1<<2)) ? TIOCM_RTS : 0); ((status & BIT(2)) ? TIOCM_RTS : 0);
return value; return value;
} }
@@ -445,14 +446,14 @@ static int keyspan_pda_tiocmset(struct tty_struct *tty,
return rc; return rc;
if (set & TIOCM_RTS) if (set & TIOCM_RTS)
status |= (1<<2); status |= BIT(2);
if (set & TIOCM_DTR) if (set & TIOCM_DTR)
status |= (1<<7); status |= BIT(7);
if (clear & TIOCM_RTS) if (clear & TIOCM_RTS)
status &= ~(1<<2); status &= ~BIT(2);
if (clear & TIOCM_DTR) if (clear & TIOCM_DTR)
status &= ~(1<<7); status &= ~BIT(7);
rc = keyspan_pda_set_modem_info(serial, status); rc = keyspan_pda_set_modem_info(serial, status);
return rc; return rc;
} }
@@ -565,7 +566,7 @@ static void keyspan_pda_dtr_rts(struct usb_serial_port *port, int on)
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
if (on) if (on)
keyspan_pda_set_modem_info(serial, (1 << 7) | (1 << 2)); keyspan_pda_set_modem_info(serial, BIT(7) | BIT(2));
else else
keyspan_pda_set_modem_info(serial, 0); keyspan_pda_set_modem_info(serial, 0);
} }