diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/amiserial.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 5540216e64fd..7607c6ebd39a 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -100,8 +100,6 @@ static struct tty_driver *serial_driver; /* number of characters left in xmit buffer before we ask for more */ #define WAKEUP_CHARS 256 -static struct async_struct *IRQ_ports; - static unsigned char current_ctl_bits; static void change_speed(struct async_struct *info, struct ktermios *old); @@ -439,7 +437,7 @@ static void check_modem_status(struct async_struct *info) static irqreturn_t ser_vbl_int( int irq, void *data) { /* vbl is just a periodic interrupt we tie into to update modem status */ - struct async_struct * info = IRQ_ports; + struct async_struct *info = data; /* * TBD - is it better to unregister from this interrupt or to * ignore it if MSI is clear ? @@ -451,13 +449,13 @@ static irqreturn_t ser_vbl_int( int irq, void *data) static irqreturn_t ser_rx_int(int irq, void *dev_id) { - struct async_struct * info; + struct serial_state *state = dev_id; + struct async_struct *info = state->info; #ifdef SERIAL_DEBUG_INTR printk("ser_rx_int..."); #endif - info = IRQ_ports; if (!info || !info->tty) return IRQ_NONE; @@ -470,14 +468,14 @@ static irqreturn_t ser_rx_int(int irq, void *dev_id) static irqreturn_t ser_tx_int(int irq, void *dev_id) { - struct async_struct * info; + struct serial_state *state = dev_id; + struct async_struct *info = state->info; if (custom.serdatr & SDR_TBE) { #ifdef SERIAL_DEBUG_INTR printk("ser_tx_int..."); #endif - info = IRQ_ports; if (!info || !info->tty) return IRQ_NONE; @@ -554,8 +552,6 @@ static int startup(struct async_struct * info) /* remember current state of the DCD and CTS bits */ current_ctl_bits = ciab.pra & (SER_DCD | SER_CTS | SER_DSR); - IRQ_ports = info; - info->MCR = 0; if (info->tty->termios->c_cflag & CBAUD) info->MCR = SER_DTR | SER_RTS; @@ -619,8 +615,6 @@ static void shutdown(struct async_struct * info) */ wake_up_interruptible(&info->delta_msr_wait); - IRQ_ports = NULL; - /* * Free the IRQ, if necessary */ @@ -1913,8 +1907,6 @@ static int __init amiga_serial_probe(struct platform_device *pdev) if (!serial_driver) return -ENOMEM; - IRQ_ports = NULL; - show_serial_version(); /* Initialize the tty_driver structure */ |