summaryrefslogtreecommitdiffstats
path: root/drivers/serial/nwpserial.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-09-19 22:13:28 +0200
committerLive-CD User <linux@linux.site>2009-09-19 22:13:28 +0200
commitebd2c8f6d2ec4012c267ecb95e72a57b8355a705 (patch)
tree36a01b2ac2520bf7e0d9362b8da17d3c894da2db /drivers/serial/nwpserial.c
parentisicom: split the open method for the isicom device (diff)
downloadlinux-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/nwpserial.c')
-rw-r--r--drivers/serial/nwpserial.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index 9e150b19d726..e1ab8ec0a4a6 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -126,7 +126,7 @@ static void nwpserial_config_port(struct uart_port *port, int flags)
static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
{
struct nwpserial_port *up = dev_id;
- struct tty_struct *tty = up->port.info->port.tty;
+ struct tty_struct *tty = up->port.state->port.tty;
irqreturn_t ret;
unsigned int iir;
unsigned char ch;
@@ -261,7 +261,7 @@ static void nwpserial_start_tx(struct uart_port *port)
struct nwpserial_port *up;
struct circ_buf *xmit;
up = container_of(port, struct nwpserial_port, port);
- xmit = &up->port.info->xmit;
+ xmit = &up->port.state->xmit;
if (port->x_char) {
nwpserial_putchar(up, up->port.x_char);