diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-09-19 13:13:28 -0700 |
|---|---|---|
| committer | Live-CD User <linux@linux.site> | 2009-09-19 13:13:28 -0700 |
| commit | ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 (patch) | |
| tree | 36a01b2ac2520bf7e0d9362b8da17d3c894da2db /drivers/serial/21285.c | |
| parent | 11d85d7b2ecc72fe752bba55389e7d11907528af (diff) | |
| download | op-kernel-dev-ebd2c8f6d2ec4012c267ecb95e72a57b8355a705.zip op-kernel-dev-ebd2c8f6d2ec4012c267ecb95e72a57b8355a705.tar.gz | |
serial: kill off uart_info
We moved this into uart_state, now move the fields out of the separate
structure and kill it off.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/21285.c')
| -rw-r--r-- | drivers/serial/21285.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index cb6d85d..1e3d193 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c @@ -86,7 +86,7 @@ static void serial21285_enable_ms(struct uart_port *port) static irqreturn_t serial21285_rx_chars(int irq, void *dev_id) { struct uart_port *port = dev_id; - struct tty_struct *tty = port->info->port.tty; + struct tty_struct *tty = port->state->port.tty; unsigned int status, ch, flag, rxs, max_count = 256; status = *CSR_UARTFLG; @@ -124,7 +124,7 @@ static irqreturn_t serial21285_rx_chars(int irq, void *dev_id) static irqreturn_t serial21285_tx_chars(int irq, void *dev_id) { struct uart_port *port = dev_id; - struct circ_buf *xmit = &port->info->xmit; + struct circ_buf *xmit = &port->state->xmit; int count = 256; if (port->x_char) { @@ -235,8 +235,8 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios, baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); quot = uart_get_divisor(port, baud); - if (port->info && port->info->port.tty) { - struct tty_struct *tty = port->info->port.tty; + if (port->state && port->state->port.tty) { + struct tty_struct *tty = port->state->port.tty; unsigned int b = port->uartclk / (16 * quot); tty_encode_baud_rate(tty, b, b); } |
