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

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

diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 2cbc7e2..cfc1c57 100644 (file)
--- 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;