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/mux.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/mux.c')
-rw-r--r-- | drivers/serial/mux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 953a5ffa9b44..7571aaa138b0 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
@@ -199,7 +199,7 @@ static void mux_break_ctl(struct uart_port *port, int break_state) | |||
199 | static void mux_write(struct uart_port *port) | 199 | static void mux_write(struct uart_port *port) |
200 | { | 200 | { |
201 | int count; | 201 | int count; |
202 | struct circ_buf *xmit = &port->info->xmit; | 202 | struct circ_buf *xmit = &port->state->xmit; |
203 | 203 | ||
204 | if(port->x_char) { | 204 | if(port->x_char) { |
205 | UART_PUT_CHAR(port, port->x_char); | 205 | UART_PUT_CHAR(port, port->x_char); |
@@ -243,7 +243,7 @@ static void mux_write(struct uart_port *port) | |||
243 | static void mux_read(struct uart_port *port) | 243 | static void mux_read(struct uart_port *port) |
244 | { | 244 | { |
245 | int data; | 245 | int data; |
246 | struct tty_struct *tty = port->info->port.tty; | 246 | struct tty_struct *tty = port->state->port.tty; |
247 | __u32 start_count = port->icount.rx; | 247 | __u32 start_count = port->icount.rx; |
248 | 248 | ||
249 | while(1) { | 249 | while(1) { |