powerpc: Remove all usages of NO_IRQ

NO_IRQ has been == 0 on powerpc for just over ten years (since commit
0ebfff1491ef ("[POWERPC] Add new interrupt mapping core and change
platforms to use it")). It's also 0 on most other arches.

Although it's fairly harmless, every now and then it causes confusion
when a driver is built on powerpc and another arch which doesn't define
NO_IRQ. There's at least 6 definitions of NO_IRQ in drivers/, at least
some of which are to work around that problem.

So we'd like to remove it. This is fairly trivial in the arch code, we
just convert:

    if (irq == NO_IRQ)	to	if (!irq)
    if (irq != NO_IRQ)	to	if (irq)
    irq = NO_IRQ;	to	irq = 0;
    return NO_IRQ;	to	return 0;

And a few other odd cases as well.

At least for now we keep the #define NO_IRQ, because there is driver
code that uses NO_IRQ and the fixes to remove those will go via other
trees.

Note we also change some occurrences in PPC sound drivers, drivers/ps3,
and drivers/macintosh.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

24 files changed, 61 insertions, 61 deletions

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 9144204442eb..ada29eaed6e2 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -240,7 +240,7 @@ static int axon_ram_probe(struct platform_device *device)
         device_add_disk(&device->dev, bank->disk);
 
         bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);
-        if (bank->irq_id == NO_IRQ) {
+        if (!bank->irq_id) {
                 dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
                 rc = -EFAULT;
                 goto failed;
@@ -250,7 +250,7 @@ static int axon_ram_probe(struct platform_device *device)
                         AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
         if (rc != 0) {
                 dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
-                bank->irq_id = NO_IRQ;
+                bank->irq_id = 0;
                 rc = -EFAULT;
                 goto failed;
         }
@@ -268,7 +268,7 @@ static int axon_ram_probe(struct platform_device *device)
 
 failed:
         if (bank != NULL) {
-                if (bank->irq_id != NO_IRQ)
+                if (bank->irq_id)
                         free_irq(bank->irq_id, device);
                 if (bank->disk != NULL) {
                         if (bank->disk->major > 0)
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 81d49476c47e..3c0eb9b25535 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -132,7 +132,7 @@ unsigned int cpm_pic_init(void)
 {
         struct device_node *np = NULL;
         struct resource res;
-        unsigned int sirq = NO_IRQ, hwirq, eirq;
+        unsigned int sirq = 0, hwirq, eirq;
         int ret;
 
         pr_debug("cpm_pic_init\n");
@@ -154,7 +154,7 @@ unsigned int cpm_pic_init(void)
                 goto end;
 
         sirq = irq_of_parse_and_map(np, 0);
-        if (sirq == NO_IRQ)
+        if (!sirq)
                 goto end;
 
         /* Initialize the CPM interrupt controller. */
@@ -168,7 +168,7 @@ unsigned int cpm_pic_init(void)
         cpm_pic_host = irq_domain_add_linear(np, 64, &cpm_pic_host_ops, NULL);
         if (cpm_pic_host == NULL) {
                 printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
-                sirq = NO_IRQ;
+                sirq = 0;
                 goto end;
         }
 
@@ -182,7 +182,7 @@ unsigned int cpm_pic_init(void)
         }
 
         eirq = irq_of_parse_and_map(np, 0);
-        if (eirq == NO_IRQ)
+        if (!eirq)
                 goto end;
 
         if (setup_irq(eirq, &cpm_error_irqaction))
diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c
index bffcc7a486a1..48866e6c1efb 100644
--- a/arch/powerpc/sysdev/ehv_pic.c
+++ b/arch/powerpc/sysdev/ehv_pic.c
@@ -155,7 +155,7 @@ static struct irq_chip ehv_pic_direct_eoi_irq_chip = {
         .irq_set_type   = ehv_pic_set_irq_type,
 };
 
-/* Return an interrupt vector or NO_IRQ if no interrupt is pending. */
+/* Return an interrupt vector or 0 if no interrupt is pending. */
 unsigned int ehv_pic_get_irq(void)
 {
         int irq;
@@ -168,7 +168,7 @@ unsigned int ehv_pic_get_irq(void)
                 ev_int_iack(0, &irq); /* legacy mode */
 
         if (irq == 0xFFFF)    /* 0xFFFF --> no irq is pending */
-                return NO_IRQ;
+                return 0;
 
         /*
          * this will also setup revmap[] in the slow path for the first
diff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c
index 06ac3c61b3d0..a6f0b96ce2c9 100644
--- a/arch/powerpc/sysdev/fsl_gtm.c
+++ b/arch/powerpc/sysdev/fsl_gtm.c
@@ -406,7 +406,7 @@ static int __init fsl_gtm_init(void)
                         unsigned int irq;
 
                         irq = irq_of_parse_and_map(np, i);
-                        if (irq == NO_IRQ) {
+                        if (!irq) {
                                 pr_err("%s: not enough interrupts specified\n",
                                        np->full_name);
                                 goto err;
diff --git a/arch/powerpc/sysdev/fsl_mpic_err.c b/arch/powerpc/sysdev/fsl_mpic_err.c
index b83f32562a37..488ec453038a 100644
--- a/arch/powerpc/sysdev/fsl_mpic_err.c
+++ b/arch/powerpc/sysdev/fsl_mpic_err.c
@@ -115,8 +115,8 @@ static irqreturn_t fsl_error_int_handler(int irq, void *data)
                 errint = __builtin_clz(eisr);
                 cascade_irq = irq_linear_revmap(mpic->irqhost,
                                  mpic->err_int_vecs[errint]);
-                WARN_ON(cascade_irq == NO_IRQ);
-                if (cascade_irq != NO_IRQ) {
+                WARN_ON(!cascade_irq);
+                if (cascade_irq) {
                         generic_handle_irq(cascade_irq);
                 } else {
                         eimr |=  1 << (31 - errint);
@@ -134,7 +134,7 @@ void mpic_err_int_init(struct mpic *mpic, irq_hw_number_t irqnum)
         int ret;
 
         virq = irq_create_mapping(mpic->irqhost, irqnum);
-        if (virq == NO_IRQ) {
+        if (!virq) {
                 pr_err("Error interrupt setup failed\n");
                 return;
         }
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 3a2be3676f43..8a244828782e 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -131,7 +131,7 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
         irq_hw_number_t hwirq;
 
         for_each_pci_msi_entry(entry, pdev) {
-                if (entry->irq == NO_IRQ)
+                if (!entry->irq)
                         continue;
                 hwirq = virq_to_hw(entry->irq);
                 msi_data = irq_get_chip_data(entry->irq);
@@ -250,7 +250,7 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 
                 virq = irq_create_mapping(msi_data->irqhost, hwirq);
 
-                if (virq == NO_IRQ) {
+                if (!virq) {
                         dev_err(&pdev->dev, "fail mapping hwirq %i\n", hwirq);
                         msi_bitmap_free_hwirqs(&msi_data->bitmap, hwirq, 1);
                         rc = -ENOSPC;
@@ -285,7 +285,7 @@ static irqreturn_t fsl_msi_cascade(int irq, void *data)
         msir_index = cascade_data->index;
 
         if (msir_index >= NR_MSI_REG_MAX)
-                cascade_irq = NO_IRQ;
+                cascade_irq = 0;
 
         switch (msi_data->feature & FSL_PIC_IP_MASK) {
         case FSL_PIC_IP_MPIC:
@@ -315,7 +315,7 @@ static irqreturn_t fsl_msi_cascade(int irq, void *data)
                 cascade_irq = irq_linear_revmap(msi_data->irqhost,
                                 msi_hwirq(msi_data, msir_index,
                                           intr_index + have_shift));
-                if (cascade_irq != NO_IRQ) {
+                if (cascade_irq) {
                         generic_handle_irq(cascade_irq);
                         ret = IRQ_HANDLED;
                 }
@@ -337,7 +337,7 @@ static int fsl_of_msi_remove(struct platform_device *ofdev)
                 if (msi->cascade_array[i]) {
                         virq = msi->cascade_array[i]->virq;
 
-                        BUG_ON(virq == NO_IRQ);
+                        BUG_ON(!virq);
 
                         free_irq(virq, msi->cascade_array[i]);
                         kfree(msi->cascade_array[i]);
@@ -362,7 +362,7 @@ static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,
         int virt_msir, i, ret;
 
         virt_msir = irq_of_parse_and_map(dev->dev.of_node, irq_index);
-        if (virt_msir == NO_IRQ) {
+        if (!virt_msir) {
                 dev_err(&dev->dev, "%s: Cannot translate IRQ index %d\n",
                         __func__, irq_index);
                 return 0;
diff --git a/arch/powerpc/sysdev/ge/ge_pic.c b/arch/powerpc/sysdev/ge/ge_pic.c
index d57b77573068..02553a8ce191 100644
--- a/arch/powerpc/sysdev/ge/ge_pic.c
+++ b/arch/powerpc/sysdev/ge/ge_pic.c
@@ -102,7 +102,7 @@ static void gef_pic_cascade(struct irq_desc *desc)
          */
         cascade_irq = gef_pic_get_irq();
 
-        if (cascade_irq != NO_IRQ)
+        if (cascade_irq)
                 generic_handle_irq(cascade_irq);
 
         chip->irq_eoi(&desc->irq_data);
@@ -206,7 +206,7 @@ void __init gef_pic_init(struct device_node *np)
 
         /* Map controller */
         gef_pic_cascade_irq = irq_of_parse_and_map(np, 0);
-        if (gef_pic_cascade_irq == NO_IRQ) {
+        if (!gef_pic_cascade_irq) {
                 printk(KERN_ERR "SBC610: failed to map cascade interrupt");
                 return;
         }
@@ -223,12 +223,12 @@ void __init gef_pic_init(struct device_node *np)
 
 /*
  * This is called when we receive an interrupt with apparently comes from this
- * chip - check, returning the highest interrupt generated or return NO_IRQ
+ * chip - check, returning the highest interrupt generated or return 0.
  */
 unsigned int gef_pic_get_irq(void)
 {
         u32 cause, mask, active;
-        unsigned int virq = NO_IRQ;
+        unsigned int virq = 0;
         int hwirq;
 
         cause = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_STATUS);
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index aa2c186d3115..bafb014e1a7e 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -68,9 +68,9 @@ unsigned int i8259_irq(void)
                 if (!pci_intack)
                         outb(0x0B, 0x20);       /* ISR register */
                 if(~inb(0x20) & 0x80)
-                        irq = NO_IRQ;
+                        irq = 0;
         } else if (irq == 0xff)
-                irq = NO_IRQ;
+                irq = 0;
 
         if (lock)
                 raw_spin_unlock(&i8259_lock);
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index f76ee39cb337..f267ee0afc08 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -853,7 +853,7 @@ void ipic_clear_mcp_status(u32 mask)
         ipic_write(primary_ipic->regs, IPIC_SERMR, mask);
 }
 
-/* Return an interrupt vector or NO_IRQ if no interrupt is pending. */
+/* Return an interrupt vector or 0 if no interrupt is pending. */
 unsigned int ipic_get_irq(void)
 {
         int irq;
@@ -864,7 +864,7 @@ unsigned int ipic_get_irq(void)
         irq = ipic_read(primary_ipic->regs, IPIC_SIVCR) & IPIC_SIVCR_VECTOR_MASK;
 
         if (irq == 0)    /* 0 --> no irq is pending */
-                return NO_IRQ;
+                return 0;
 
         return irq_linear_revmap(primary_ipic->irqhost, irq);
 }
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index b7cf7abff2eb..3e828b20c21e 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -79,7 +79,7 @@ unsigned int mpc8xx_get_irq(void)
         irq = in_be32(&siu_reg->sc_sivec) >> 26;
 
         if (irq == PIC_VEC_SPURRIOUS)
-                irq = NO_IRQ;
+                irq = 0;
 
         return irq_linear_revmap(mpc8xx_pic_host, irq);
 
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 7de45b2df366..4d48cecfedd1 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1649,7 +1649,7 @@ void __init mpic_init(struct mpic *mpic)
         /* Check if this MPIC is chained from a parent interrupt controller */
         if (mpic->flags & MPIC_SECONDARY) {
                 int virq = irq_of_parse_and_map(mpic->node, 0);
-                if (virq != NO_IRQ) {
+                if (virq) {
                         printk(KERN_INFO "%s: hooking up to IRQ %d\n",
                                         mpic->node->full_name, virq);
                         irq_set_handler_data(virq, mpic);
@@ -1778,13 +1778,13 @@ static unsigned int _mpic_get_one_irq(struct mpic *mpic, int reg)
         if (unlikely(src == mpic->spurious_vec)) {
                 if (mpic->flags & MPIC_SPV_EOI)
                         mpic_eoi(mpic);
-                return NO_IRQ;
+                return 0;
         }
         if (unlikely(mpic->protected && test_bit(src, mpic->protected))) {
                 printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n",
                                    mpic->name, (int)src);
                 mpic_eoi(mpic);
-                return NO_IRQ;
+                return 0;
         }
 
         return irq_linear_revmap(mpic->irqhost, src);
@@ -1817,17 +1817,17 @@ unsigned int mpic_get_coreint_irq(void)
         if (unlikely(src == mpic->spurious_vec)) {
                 if (mpic->flags & MPIC_SPV_EOI)
                         mpic_eoi(mpic);
-                return NO_IRQ;
+                return 0;
         }
         if (unlikely(mpic->protected && test_bit(src, mpic->protected))) {
                 printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n",
                                    mpic->name, (int)src);
-                return NO_IRQ;
+                return 0;
         }
 
         return irq_linear_revmap(mpic->irqhost, src);
 #else
-        return NO_IRQ;
+        return 0;
 #endif
 }
 
@@ -1852,7 +1852,7 @@ void mpic_request_ipis(void)
         for (i = 0; i < 4; i++) {
                 unsigned int vipi = irq_create_mapping(mpic->irqhost,
                                                        mpic->ipi_vecs[0] + i);
-                if (vipi == NO_IRQ) {
+                if (!vipi) {
                         printk(KERN_ERR "Failed to map %s\n", smp_ipi_name[i]);
                         continue;
                 }
diff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c
index 3f165d972a0e..db2286be5d9a 100644
--- a/arch/powerpc/sysdev/mpic_msgr.c
+++ b/arch/powerpc/sysdev/mpic_msgr.c
@@ -238,7 +238,7 @@ static int mpic_msgr_probe(struct platform_device *dev)
 
                 if (receive_mask & (1 << i)) {
                         msgr->irq = irq_of_parse_and_map(np, irq_index);
-                        if (msgr->irq == NO_IRQ) {
+                        if (!msgr->irq) {
                                 dev_err(&dev->dev,
                                                 "Missing interrupt specifier");
                                 kfree(msgr);
@@ -246,7 +246,7 @@ static int mpic_msgr_probe(struct platform_device *dev)
                         }
                         irq_index += 1;
                 } else {
-                        msgr->irq = NO_IRQ;
+                        msgr->irq = 0;
                 }
 
                 mpic_msgrs[reg_number] = msgr;
diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 2cbc7e29b85f..cfc1c57d760f 100644
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -110,7 +110,7 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
         irq_hw_number_t hwirq;
 
         for_each_pci_msi_entry(entry, pdev) {
-                if (entry->irq == NO_IRQ)
+                if (!entry->irq)
                         continue;
 
                 hwirq = virq_to_hw(entry->irq);
@@ -155,7 +155,7 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                 msg.address_hi = addr >> 32;
 
                 virq = irq_create_mapping(msi_mpic->irqhost, hwirq);
-                if (virq == NO_IRQ) {
+                if (!virq) {
                         pr_debug("u3msi: failed mapping hwirq 0x%x\n", hwirq);
                         msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, 1);
                         return -ENOSPC;
diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index 0f842dd16bcd..a79953deb489 100644
--- a/arch/powerpc/sysdev/mv64x60_pic.c
+++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -272,7 +272,7 @@ unsigned int mv64x60_get_irq(void)
         u32 cause;
         int level1;
         irq_hw_number_t hwirq;
-        int virq = NO_IRQ;
+        int virq = 0;
 
         cause = in_le32(mv64x60_irq_reg_base + MV64X60_IC_CPU0_SELECT_CAUSE);
         if (cause & MV64X60_SELECT_CAUSE_HIGH) {
diff --git a/arch/powerpc/sysdev/pmi.c b/arch/powerpc/sysdev/pmi.c
index 8a0b77a3ec0c..9ea6a221d9d5 100644
--- a/arch/powerpc/sysdev/pmi.c
+++ b/arch/powerpc/sysdev/pmi.c
@@ -158,7 +158,7 @@ static int pmi_of_probe(struct platform_device *dev)
         data->dev = dev;
 
         data->irq = irq_of_parse_and_map(np, 0);
-        if (data->irq == NO_IRQ) {
+        if (!data->irq) {
                 printk(KERN_ERR "pmi: invalid interrupt.\n");
                 rc = -EFAULT;
                 goto error_cleanup_iomap;
diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index 52a93dcae262..9926ad67af76 100644
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
@@ -60,7 +60,7 @@ static int hsta_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 }
 
                 hwirq = ppc4xx_hsta_msi.irq_map[irq];
-                if (hwirq == NO_IRQ) {
+                if (!hwirq) {
                         pr_err("%s: Failed mapping irq %d\n", __func__, irq);
                         return -EINVAL;
                 }
@@ -110,7 +110,7 @@ static void hsta_teardown_msi_irqs(struct pci_dev *dev)
         int irq;
 
         for_each_pci_msi_entry(entry, dev) {
-                if (entry->irq == NO_IRQ)
+                if (!entry->irq)
                         continue;
 
                 irq = hsta_find_hwirq_offset(entry->irq);
@@ -166,7 +166,7 @@ static int hsta_msi_probe(struct platform_device *pdev)
         for (irq = 0; irq < irq_count; irq++) {
                 ppc4xx_hsta_msi.irq_map[irq] =
                         irq_of_parse_and_map(dev->of_node, irq);
-                if (ppc4xx_hsta_msi.irq_map[irq] == NO_IRQ) {
+                if (!ppc4xx_hsta_msi.irq_map[irq]) {
                         dev_err(dev, "Unable to map IRQ\n");
                         ret = -EINVAL;
                         goto out2;
diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c
index 8fb806135043..590dab4f47d6 100644
--- a/arch/powerpc/sysdev/ppc4xx_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_msi.c
@@ -102,7 +102,7 @@ static int ppc4xx_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                                         __func__);
                 }
                 virq = irq_of_parse_and_map(msi_data->msi_dev, int_no);
-                if (virq == NO_IRQ) {
+                if (!virq) {
                         dev_err(&dev->dev, "%s: fail mapping irq\n", __func__);
                         msi_bitmap_free_hwirqs(&msi_data->bitmap, int_no, 1);
                         return -ENOSPC;
@@ -129,7 +129,7 @@ void ppc4xx_teardown_msi_irqs(struct pci_dev *dev)
         dev_dbg(&dev->dev, "PCIE-MSI: tearing down msi irqs\n");
 
         for_each_pci_msi_entry(entry, dev) {
-                if (entry->irq == NO_IRQ)
+                if (!entry->irq)
                         continue;
                 hwirq = virq_to_hw(entry->irq);
                 irq_set_msi_desc(entry->irq, NULL);
@@ -201,7 +201,7 @@ static int ppc4xx_of_msi_remove(struct platform_device *dev)
 
         for (i = 0; i < msi_irqs; i++) {
                 virq = msi->msi_virqs[i];
-                if (virq != NO_IRQ)
+                if (virq)
                         irq_dispose_mapping(virq);
         }
 
diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c
index 5c77c9ba33aa..d41134d2f786 100644
--- a/arch/powerpc/sysdev/ppc4xx_soc.c
+++ b/arch/powerpc/sysdev/ppc4xx_soc.c
@@ -109,7 +109,7 @@ static int __init ppc4xx_l2c_probe(void)
 
         /* Get and map irq number from device tree */
         irq = irq_of_parse_and_map(np, 0);
-        if (irq == NO_IRQ) {
+        if (!irq) {
                 printk(KERN_ERR "irq_of_parse_and_map failed\n");
                 of_node_put(np);
                 return -ENODEV;
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 379de955aae3..57c971b7839c 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -433,7 +433,7 @@ void tsi108_irq_cascade(struct irq_desc *desc)
         struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = get_pci_source();
 
-        if (cascade_irq != NO_IRQ)
+        if (cascade_irq)
                 generic_handle_irq(cascade_irq);
 
         chip->irq_eoi(&desc->irq_data);
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 6893d8f236df..a00949f3e378 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -319,7 +319,7 @@ void __init uic_init_tree(void)
         }
 }
 
-/* Return an interrupt vector or NO_IRQ if no interrupt is pending. */
+/* Return an interrupt vector or 0 if no interrupt is pending. */
 unsigned int uic_get_irq(void)
 {
         u32 msr;
diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c
index c1917cf67c3d..e7fa26c4ff73 100644
--- a/arch/powerpc/sysdev/xics/icp-hv.c
+++ b/arch/powerpc/sysdev/xics/icp-hv.c
@@ -112,10 +112,10 @@ static unsigned int icp_hv_get_irq(void)
         unsigned int irq;
 
         if (vec == XICS_IRQ_SPURIOUS)
-                return NO_IRQ;
+                return 0;
 
         irq = irq_find_mapping(xics_host, vec);
-        if (likely(irq != NO_IRQ)) {
+        if (likely(irq)) {
                 xics_push_cppr(vec);
                 return irq;
         }
@@ -126,7 +126,7 @@ static unsigned int icp_hv_get_irq(void)
         /* We might learn about it later, so EOI it */
         icp_hv_set_xirr(xirr);
 
-        return NO_IRQ;
+        return 0;
 }
 
 static void icp_hv_set_cpu_priority(unsigned char cppr)
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index afdf62f2a695..8a6a043e239b 100644
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -124,10 +124,10 @@ static unsigned int icp_native_get_irq(void)
         unsigned int irq;
 
         if (vec == XICS_IRQ_SPURIOUS)
-                return NO_IRQ;
+                return 0;
 
         irq = irq_find_mapping(xics_host, vec);
-        if (likely(irq != NO_IRQ)) {
+        if (likely(irq)) {
                 xics_push_cppr(vec);
                 return irq;
         }
@@ -138,7 +138,7 @@ static unsigned int icp_native_get_irq(void)
         /* We might learn about it later, so EOI it */
         icp_native_set_xirr(xirr);
 
-        return NO_IRQ;
+        return 0;
 }
 
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/sysdev/xics/icp-opal.c b/arch/powerpc/sysdev/xics/icp-opal.c
index 57d72f10a97f..7357cfddb040 100644
--- a/arch/powerpc/sysdev/xics/icp-opal.c
+++ b/arch/powerpc/sysdev/xics/icp-opal.c
@@ -51,14 +51,14 @@ static unsigned int icp_opal_get_irq(void)
 
         rc = opal_int_get_xirr(&xirr, false);
         if (rc < 0)
-                return NO_IRQ;
+                return 0;
         xirr = be32_to_cpu(xirr);
         vec = xirr & 0x00ffffff;
         if (vec == XICS_IRQ_SPURIOUS)
-                return NO_IRQ;
+                return 0;
 
         irq = irq_find_mapping(xics_host, vec);
-        if (likely(irq != NO_IRQ)) {
+        if (likely(irq)) {
                 xics_push_cppr(vec);
                 return irq;
         }
@@ -69,7 +69,7 @@ static unsigned int icp_opal_get_irq(void)
         /* We might learn about it later, so EOI it */
         opal_int_eoi(xirr);
 
-        return NO_IRQ;
+        return 0;
 }
 
 static void icp_opal_set_cpu_priority(unsigned char cppr)
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index 9d530f479588..69d858e51ac7 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -131,7 +131,7 @@ static void xics_request_ipi(void)
         unsigned int ipi;
 
         ipi = irq_create_mapping(xics_host, XICS_IPI);
-        BUG_ON(ipi == NO_IRQ);
+        BUG_ON(!ipi);
 
         /*
          * IPIs are marked IRQF_PERCPU. The handler was set in map.