Commit beea33d4 authored by Johan Hovold's avatar Johan Hovold

USB: serial: ch341: rename shadow modem-control register

Rename the shadow modem-control register currently named "line_control"
to the less confusing "mcr".
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 91e0efcd
...@@ -93,7 +93,7 @@ MODULE_DEVICE_TABLE(usb, id_table); ...@@ -93,7 +93,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
struct ch341_private { struct ch341_private {
spinlock_t lock; /* access lock */ spinlock_t lock; /* access lock */
unsigned baud_rate; /* set baud rate */ unsigned baud_rate; /* set baud rate */
u8 line_control; /* set line control value RTS/DTR */ u8 mcr;
u8 line_status; /* active status of modem control inputs */ u8 line_status; /* active status of modem control inputs */
u8 lcr; u8 lcr;
}; };
...@@ -251,7 +251,7 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv) ...@@ -251,7 +251,7 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv)
if (r < 0) if (r < 0)
goto out; goto out;
r = ch341_set_handshake(dev, priv->line_control); r = ch341_set_handshake(dev, priv->mcr);
out: kfree(buffer); out: kfree(buffer);
return r; return r;
...@@ -306,11 +306,11 @@ static void ch341_dtr_rts(struct usb_serial_port *port, int on) ...@@ -306,11 +306,11 @@ static void ch341_dtr_rts(struct usb_serial_port *port, int on)
/* drop DTR and RTS */ /* drop DTR and RTS */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (on) if (on)
priv->line_control |= CH341_BIT_RTS | CH341_BIT_DTR; priv->mcr |= CH341_BIT_RTS | CH341_BIT_DTR;
else else
priv->line_control &= ~(CH341_BIT_RTS | CH341_BIT_DTR); priv->mcr &= ~(CH341_BIT_RTS | CH341_BIT_DTR);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
ch341_set_handshake(port->serial->dev, priv->line_control); ch341_set_handshake(port->serial->dev, priv->mcr);
} }
static void ch341_close(struct usb_serial_port *port) static void ch341_close(struct usb_serial_port *port)
...@@ -415,12 +415,12 @@ static void ch341_set_termios(struct tty_struct *tty, ...@@ -415,12 +415,12 @@ static void ch341_set_termios(struct tty_struct *tty,
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (C_BAUD(tty) == B0) if (C_BAUD(tty) == B0)
priv->line_control &= ~(CH341_BIT_DTR | CH341_BIT_RTS); priv->mcr &= ~(CH341_BIT_DTR | CH341_BIT_RTS);
else if (old_termios && (old_termios->c_cflag & CBAUD) == B0) else if (old_termios && (old_termios->c_cflag & CBAUD) == B0)
priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS); priv->mcr |= (CH341_BIT_DTR | CH341_BIT_RTS);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
ch341_set_handshake(port->serial->dev, priv->line_control); ch341_set_handshake(port->serial->dev, priv->mcr);
} }
static void ch341_break_ctl(struct tty_struct *tty, int break_state) static void ch341_break_ctl(struct tty_struct *tty, int break_state)
...@@ -476,14 +476,14 @@ static int ch341_tiocmset(struct tty_struct *tty, ...@@ -476,14 +476,14 @@ static int ch341_tiocmset(struct tty_struct *tty,
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (set & TIOCM_RTS) if (set & TIOCM_RTS)
priv->line_control |= CH341_BIT_RTS; priv->mcr |= CH341_BIT_RTS;
if (set & TIOCM_DTR) if (set & TIOCM_DTR)
priv->line_control |= CH341_BIT_DTR; priv->mcr |= CH341_BIT_DTR;
if (clear & TIOCM_RTS) if (clear & TIOCM_RTS)
priv->line_control &= ~CH341_BIT_RTS; priv->mcr &= ~CH341_BIT_RTS;
if (clear & TIOCM_DTR) if (clear & TIOCM_DTR)
priv->line_control &= ~CH341_BIT_DTR; priv->mcr &= ~CH341_BIT_DTR;
control = priv->line_control; control = priv->mcr;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return ch341_set_handshake(port->serial->dev, control); return ch341_set_handshake(port->serial->dev, control);
...@@ -577,7 +577,7 @@ static int ch341_tiocmget(struct tty_struct *tty) ...@@ -577,7 +577,7 @@ static int ch341_tiocmget(struct tty_struct *tty)
unsigned int result; unsigned int result;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
mcr = priv->line_control; mcr = priv->mcr;
status = priv->line_status; status = priv->line_status;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
......
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