diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-09-19 20:13:28 (GMT) |
|---|---|---|
| committer | Live-CD User <linux@linux.site> | 2009-09-19 20:13:28 (GMT) |
| commit | ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 (patch) | |
| tree | 36a01b2ac2520bf7e0d9362b8da17d3c894da2db /drivers/serial/netx-serial.c | |
| parent | 11d85d7b2ecc72fe752bba55389e7d11907528af (diff) | |
| download | linux-fsl-qoriq-ebd2c8f6d2ec4012c267ecb95e72a57b8355a705.tar.xz | |
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/netx-serial.c')
| -rw-r--r-- | drivers/serial/netx-serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c index 3e5dda8..7735c9f 100644 --- a/drivers/serial/netx-serial.c +++ b/drivers/serial/netx-serial.c @@ -140,7 +140,7 @@ static void netx_enable_ms(struct uart_port *port) static inline void netx_transmit_buffer(struct uart_port *port) { - struct circ_buf *xmit = &port->info->xmit; + struct circ_buf *xmit = &port->state->xmit; if (port->x_char) { writel(port->x_char, port->membase + UART_DR); @@ -185,7 +185,7 @@ static unsigned int netx_tx_empty(struct uart_port *port) static void netx_txint(struct uart_port *port) { - struct circ_buf *xmit = &port->info->xmit; + struct circ_buf *xmit = &port->state->xmit; if (uart_circ_empty(xmit) || uart_tx_stopped(port)) { netx_stop_tx(port); @@ -201,7 +201,7 @@ static void netx_txint(struct uart_port *port) static void netx_rxint(struct uart_port *port) { unsigned char rx, flg, status; - struct tty_struct *tty = port->info->port.tty; + struct tty_struct *tty = port->state->port.tty; while (!(readl(port->membase + UART_FR) & FR_RXFE)) { rx = readl(port->membase + UART_DR); |