Commit 448b6dc5 authored by Johan Hovold's avatar Johan Hovold

USB: serial: ch341: rename LCR variable in set_termios

Rename the line-control-register variable in set_termios to "lcr" and
use u8 type to match the shadow register.
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent e8024460
...@@ -364,7 +364,7 @@ static void ch341_set_termios(struct tty_struct *tty, ...@@ -364,7 +364,7 @@ static void ch341_set_termios(struct tty_struct *tty,
struct ch341_private *priv = usb_get_serial_port_data(port); struct ch341_private *priv = usb_get_serial_port_data(port);
unsigned baud_rate; unsigned baud_rate;
unsigned long flags; unsigned long flags;
unsigned char ctrl; u8 lcr;
int r; int r;
/* redundant changes may cause the chip to lose bytes */ /* redundant changes may cause the chip to lose bytes */
...@@ -373,43 +373,43 @@ static void ch341_set_termios(struct tty_struct *tty, ...@@ -373,43 +373,43 @@ static void ch341_set_termios(struct tty_struct *tty,
baud_rate = tty_get_baud_rate(tty); baud_rate = tty_get_baud_rate(tty);
ctrl = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX; lcr = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX;
switch (C_CSIZE(tty)) { switch (C_CSIZE(tty)) {
case CS5: case CS5:
ctrl |= CH341_LCR_CS5; lcr |= CH341_LCR_CS5;
break; break;
case CS6: case CS6:
ctrl |= CH341_LCR_CS6; lcr |= CH341_LCR_CS6;
break; break;
case CS7: case CS7:
ctrl |= CH341_LCR_CS7; lcr |= CH341_LCR_CS7;
break; break;
case CS8: case CS8:
ctrl |= CH341_LCR_CS8; lcr |= CH341_LCR_CS8;
break; break;
} }
if (C_PARENB(tty)) { if (C_PARENB(tty)) {
ctrl |= CH341_LCR_ENABLE_PAR; lcr |= CH341_LCR_ENABLE_PAR;
if (C_PARODD(tty) == 0) if (C_PARODD(tty) == 0)
ctrl |= CH341_LCR_PAR_EVEN; lcr |= CH341_LCR_PAR_EVEN;
if (C_CMSPAR(tty)) if (C_CMSPAR(tty))
ctrl |= CH341_LCR_MARK_SPACE; lcr |= CH341_LCR_MARK_SPACE;
} }
if (C_CSTOPB(tty)) if (C_CSTOPB(tty))
ctrl |= CH341_LCR_STOP_BITS_2; lcr |= CH341_LCR_STOP_BITS_2;
if (baud_rate) { if (baud_rate) {
priv->baud_rate = baud_rate; priv->baud_rate = baud_rate;
r = ch341_set_baudrate_lcr(port->serial->dev, priv, ctrl); r = ch341_set_baudrate_lcr(port->serial->dev, priv, lcr);
if (r < 0 && old_termios) { if (r < 0 && old_termios) {
priv->baud_rate = tty_termios_baud_rate(old_termios); priv->baud_rate = tty_termios_baud_rate(old_termios);
tty_termios_copy_hw(&tty->termios, old_termios); tty_termios_copy_hw(&tty->termios, old_termios);
} else if (r == 0) { } else if (r == 0) {
priv->lcr = ctrl; priv->lcr = lcr;
} }
} }
......
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