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>

6 files changed, 7 insertions, 7 deletions

diff --git a/drivers/tty/hvc/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c
index 5fe4631e2a61..1560d235449e 100644
--- a/drivers/tty/hvc/hvc_beat.c
+++ b/drivers/tty/hvc/hvc_beat.c
@@ -113,7 +113,7 @@ static int __init hvc_beat_init(void)
         if (!firmware_has_feature(FW_FEATURE_BEAT))
                 return -ENODEV;
 
-        hp = hvc_alloc(0, NO_IRQ, &hvc_beat_get_put_ops, 16);
+        hp = hvc_alloc(0, 0, &hvc_beat_get_put_ops, 16);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
         hvc_beat_dev = hp;
diff --git a/drivers/tty/hvc/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
index 61c4a61558d9..0069bb86ba49 100644
--- a/drivers/tty/hvc/hvc_rtas.c
+++ b/drivers/tty/hvc/hvc_rtas.c
@@ -94,7 +94,7 @@ static int __init hvc_rtas_init(void)
 
         /* Allocate an hvc_struct for the console device we instantiated
          * earlier.  Save off hp so that we can return it on exit */
-        hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops, 16);
+        hp = hvc_alloc(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops, 16);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
 
diff --git a/drivers/tty/hvc/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
index b0957e61a7be..4c9b13e7748c 100644
--- a/drivers/tty/hvc/hvc_udbg.c
+++ b/drivers/tty/hvc/hvc_udbg.c
@@ -69,7 +69,7 @@ static int __init hvc_udbg_init(void)
 
         BUG_ON(hvc_udbg_dev);
 
-        hp = hvc_alloc(0, NO_IRQ, &hvc_udbg_ops, 16);
+        hp = hvc_alloc(0, 0, &hvc_udbg_ops, 16);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
 
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 52fdf60bdbe2..a1b0a75c3eae 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -176,7 +176,7 @@ static int __init xen_hvc_init(void)
                 xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn);
         }
         if (xencons_irq < 0)
-                xencons_irq = 0; /* NO_IRQ */
+                xencons_irq = 0;
         else
                 irq_set_noprobe(xencons_irq);
 
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index b9040bec36bd..df7e7a0a5e6c 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -1203,7 +1203,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
 {
         struct hvcs_struct *hvcsd;
         unsigned long flags;
-        int irq = NO_IRQ;
+        int irq;
 
         /*
          * Is someone trying to close the file associated with this device after
@@ -1264,7 +1264,7 @@ static void hvcs_hangup(struct tty_struct * tty)
         struct hvcs_struct *hvcsd = tty->driver_data;
         unsigned long flags;
         int temp_open_count;
-        int irq = NO_IRQ;
+        int irq;
 
         spin_lock_irqsave(&hvcsd->lock, flags);
         /* Preserve this so that we know how many kref refs to put */
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index cdfa3e02d627..1b5f28bd7930 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -1237,7 +1237,7 @@ static int __init hvsi_console_init(void)
                 hp->state = HVSI_CLOSED;
                 hp->vtermno = *vtermno;
                 hp->virq = irq_create_mapping(NULL, irq[0]);
-                if (hp->virq == NO_IRQ) {
+                if (hp->virq == 0) {
                         printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
                                 __func__, irq[0]);
                         continue;