aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/m32r_sio.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-01-26 12:44:09 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-26 20:14:50 -0500
commitd4e33fac2408d37f7b52e80ca2a89f9fb482914f (patch)
treedd25baa1bc251ad2aa61a07eda7f95a4d7094126 /drivers/tty/serial/m32r_sio.c
parent3afbd89c9639c344300dcdd7d4e5e18dda559fd4 (diff)
serial: Kill off NO_IRQ
We transform the offenders into a test of irq <= 0 which will be ok while the ARM people get their platform sorted. Once that is done (or in a while if they don't do it anyway) then we will change them all to !irq checks. For arch specific drivers that are already using NO_IRQ = 0 we just test against zero so we don't need to re-review them later. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial/m32r_sio.c')
-rw-r--r--drivers/tty/serial/m32r_sio.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 94a6792bf97b..e465dda63edf 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -70,13 +70,6 @@
70 70
71#define PASS_LIMIT 256 71#define PASS_LIMIT 256
72 72
73/*
74 * We default to IRQ0 for the "no irq" hack. Some
75 * machine types want others as well - they're free
76 * to redefine this in their header file.
77 */
78#define is_real_interrupt(irq) ((irq) != 0)
79
80#define BASE_BAUD 115200 73#define BASE_BAUD 115200
81 74
82/* Standard COM flags */ 75/* Standard COM flags */
@@ -640,7 +633,7 @@ static int m32r_sio_startup(struct uart_port *port)
640 * hardware interrupt, we use a timer-based system. The original 633 * hardware interrupt, we use a timer-based system. The original
641 * driver used to do this with IRQ0. 634 * driver used to do this with IRQ0.
642 */ 635 */
643 if (!is_real_interrupt(up->port.irq)) { 636 if (!up->port.irq) {
644 unsigned int timeout = up->port.timeout; 637 unsigned int timeout = up->port.timeout;
645 638
646 timeout = timeout > 6 ? (timeout / 2 - 2) : 1; 639 timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
@@ -687,7 +680,7 @@ static void m32r_sio_shutdown(struct uart_port *port)
687 680
688 sio_init(); 681 sio_init();
689 682
690 if (!is_real_interrupt(up->port.irq)) 683 if (!up->port.irq)
691 del_timer_sync(&up->timer); 684 del_timer_sync(&up->timer);
692 else 685 else
693 serial_unlink_irq_chain(up); 686 serial_unlink_irq_chain(up);