diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-09-19 22:13:28 +0200 |
|---|---|---|
| committer | Live-CD User <linux@linux.site> | 2009-09-19 22:13:28 +0200 |
| commit | ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 (patch) | |
| tree | 36a01b2ac2520bf7e0d9362b8da17d3c894da2db /drivers/serial/sc26xx.c | |
| parent | isicom: split the open method for the isicom device (diff) | |
| download | linux-ebd2c8f6d2ec4012c267ecb95e72a57b8355a705.tar.xz linux-ebd2c8f6d2ec4012c267ecb95e72a57b8355a705.zip | |
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/sc26xx.c')
| -rw-r--r-- | drivers/serial/sc26xx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/sc26xx.c b/drivers/serial/sc26xx.c index e0be11ceaa25..75038ad2b242 100644 --- a/drivers/serial/sc26xx.c +++ b/drivers/serial/sc26xx.c @@ -140,8 +140,8 @@ static struct tty_struct *receive_chars(struct uart_port *port) char flag; u8 status; - if (port->info != NULL) /* Unopened serial console */ - tty = port->info->port.tty; + if (port->state != NULL) /* Unopened serial console */ + tty = port->state->port.tty; while (limit-- > 0) { status = READ_SC_PORT(port, SR); @@ -190,10 +190,10 @@ static void transmit_chars(struct uart_port *port) { struct circ_buf *xmit; - if (!port->info) + if (!port->state) return; - xmit = &port->info->xmit; + xmit = &port->state->xmit; if (uart_circ_empty(xmit) || uart_tx_stopped(port)) { sc26xx_disable_irq(port, IMR_TXRDY); return; @@ -316,7 +316,7 @@ static void sc26xx_stop_tx(struct uart_port *port) /* port->lock held by caller. */ static void sc26xx_start_tx(struct uart_port *port) { - struct circ_buf *xmit = &port->info->xmit; + struct circ_buf *xmit = &port->state->xmit; while (!uart_circ_empty(xmit)) { if (!(READ_SC_PORT(port, SR) & SR_TXRDY)) { |