Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[cascardo/linux.git] / arch / powerpc / sysdev / fsl_msi.c

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 3a2be36..8a24482 100644 (file)
--- 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;