diff options
| author | Peter Hung <hpeter@gmail.com> | 2015-03-17 17:48:19 +0800 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2015-03-27 17:29:25 +0100 |
| commit | b830d07dc3f6891cd4788f651fa240d32fdbc068 (patch) | |
| tree | 60c258f442b15f447e9435202203f23005c4bff6 /drivers/usb/serial/f81232.c | |
| parent | 394a10331a9e43100a8ee293255cfc428c7355ac (diff) | |
| download | blackbird-op-linux-b830d07dc3f6891cd4788f651fa240d32fdbc068.tar.gz blackbird-op-linux-b830d07dc3f6891cd4788f651fa240d32fdbc068.zip | |
USB: f81232: rename private struct member name
Change private struct member name from line_status to modem_status.
It will store MSR for some functions used
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/f81232.c')
| -rw-r--r-- | drivers/usb/serial/f81232.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index c5dc233db2d9..669a2f2e7fdb 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -47,7 +47,7 @@ MODULE_DEVICE_TABLE(usb, id_table); struct f81232_private { spinlock_t lock; u8 line_control; - u8 line_status; + u8 modem_status; }; static void f81232_update_line_status(struct usb_serial_port *port, @@ -113,8 +113,8 @@ static void f81232_process_read_urb(struct urb *urb) /* update line status */ spin_lock_irqsave(&priv->lock, flags); - line_status = priv->line_status; - priv->line_status &= ~UART_STATE_TRANSIENT_MASK; + line_status = priv->modem_status; + priv->modem_status &= ~UART_STATE_TRANSIENT_MASK; spin_unlock_irqrestore(&priv->lock, flags); if (!urb->actual_length) @@ -241,7 +241,7 @@ static void f81232_dtr_rts(struct usb_serial_port *port, int on) static int f81232_carrier_raised(struct usb_serial_port *port) { struct f81232_private *priv = usb_get_serial_port_data(port); - if (priv->line_status & UART_DCD) + if (priv->modem_status & UART_DCD) return 1; return 0; } |
