diff options
author | Alan Cox <alan@linux.intel.com> | 2009-09-19 16:13:28 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:28 -0400 |
commit | ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 (patch) | |
tree | 36a01b2ac2520bf7e0d9362b8da17d3c894da2db /drivers/serial/uartlite.c | |
parent | 11d85d7b2ecc72fe752bba55389e7d11907528af (diff) |
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/uartlite.c')
-rw-r--r-- | drivers/serial/uartlite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index 3317148a4b93..5d3a573d6994 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c | |||
@@ -75,7 +75,7 @@ static struct uart_port ulite_ports[ULITE_NR_UARTS]; | |||
75 | 75 | ||
76 | static int ulite_receive(struct uart_port *port, int stat) | 76 | static int ulite_receive(struct uart_port *port, int stat) |
77 | { | 77 | { |
78 | struct tty_struct *tty = port->info->port.tty; | 78 | struct tty_struct *tty = port->state->port.tty; |
79 | unsigned char ch = 0; | 79 | unsigned char ch = 0; |
80 | char flag = TTY_NORMAL; | 80 | char flag = TTY_NORMAL; |
81 | 81 | ||
@@ -125,7 +125,7 @@ static int ulite_receive(struct uart_port *port, int stat) | |||
125 | 125 | ||
126 | static int ulite_transmit(struct uart_port *port, int stat) | 126 | static int ulite_transmit(struct uart_port *port, int stat) |
127 | { | 127 | { |
128 | struct circ_buf *xmit = &port->info->xmit; | 128 | struct circ_buf *xmit = &port->state->xmit; |
129 | 129 | ||
130 | if (stat & ULITE_STATUS_TXFULL) | 130 | if (stat & ULITE_STATUS_TXFULL) |
131 | return 0; | 131 | return 0; |
@@ -162,7 +162,7 @@ static irqreturn_t ulite_isr(int irq, void *dev_id) | |||
162 | busy |= ulite_transmit(port, stat); | 162 | busy |= ulite_transmit(port, stat); |
163 | } while (busy); | 163 | } while (busy); |
164 | 164 | ||
165 | tty_flip_buffer_push(port->info->port.tty); | 165 | tty_flip_buffer_push(port->state->port.tty); |
166 | 166 | ||
167 | return IRQ_HANDLED; | 167 | return IRQ_HANDLED; |
168 | } | 168 | } |