FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-30 13:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TTY: amiserial, remove IRQ_ports

Browse Source 
They used to work as a storage for 'info' pointer used in ISRs.  They
are not really needed. Just pass the pointer through request_irq to
the handlers.

It was set to NULL and tested in the ISRs, but we do not need the
tests as we disable all the interrupts at the same places where NULL
sets were.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-03-05 14:52:19 +01:00 committed by Greg Kroah-Hartman
parent 2f8c521a1d
commit 13c9062122
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/tty/amiserial.c
View File

@ -100,8 +100,6 @@ static struct tty_driver *serial_driver;
/* number of characters left in xmit buffer before we ask for more */ /* number of characters left in xmit buffer before we ask for more */
#define WAKEUP_CHARS 256 #define WAKEUP_CHARS 256
static struct async_struct *IRQ_ports;
static unsigned char current_ctl_bits; static unsigned char current_ctl_bits;
static void change_speed(struct async_struct *info, struct ktermios *old); 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) static irqreturn_t ser_vbl_int( int irq, void *data)
{ {
/* vbl is just a periodic interrupt we tie into to update modem status */ /* 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 * TBD - is it better to unregister from this interrupt or to
* ignore it if MSI is clear ? * 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) 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 #ifdef SERIAL_DEBUG_INTR
printk("ser_rx_int..."); printk("ser_rx_int...");
#endif #endif
info = IRQ_ports;
if (!info || !info->tty) if (!info || !info->tty)
return IRQ_NONE; 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) 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) { if (custom.serdatr & SDR_TBE) {
#ifdef SERIAL_DEBUG_INTR #ifdef SERIAL_DEBUG_INTR
printk("ser_tx_int..."); printk("ser_tx_int...");
#endif #endif
info = IRQ_ports;
if (!info || !info->tty) if (!info || !info->tty)
return IRQ_NONE; return IRQ_NONE;
@ -554,8 +552,6 @@ static int startup(struct async_struct * info)
/* remember current state of the DCD and CTS bits */ /* remember current state of the DCD and CTS bits */
current_ctl_bits = ciab.pra & (SER_DCD | SER_CTS | SER_DSR); current_ctl_bits = ciab.pra & (SER_DCD | SER_CTS | SER_DSR);
IRQ_ports = info;
info->MCR = 0; info->MCR = 0;
if (info->tty->termios->c_cflag & CBAUD) if (info->tty->termios->c_cflag & CBAUD)
info->MCR = SER_DTR | SER_RTS; info->MCR = SER_DTR | SER_RTS;
@ -619,8 +615,6 @@ static void shutdown(struct async_struct * info)
*/ */
wake_up_interruptible(&info->delta_msr_wait); wake_up_interruptible(&info->delta_msr_wait);
IRQ_ports = NULL;
/* /*
* Free the IRQ, if necessary * Free the IRQ, if necessary
*/ */
@ -1913,8 +1907,6 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
if (!serial_driver) if (!serial_driver)
return -ENOMEM; return -ENOMEM;
IRQ_ports = NULL;
show_serial_version(); show_serial_version();
/* Initialize the tty_driver structure */ /* Initialize the tty_driver structure */