Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / arch / mips / pci / msi-xlp.c

diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c
index 1ef3ed607f47ef5fa68beee0de0dc0a8555ceffd..fa374fe3746ba344f30e2b14b8ff6c3669bc5c88 100644 (file)
--- a/arch/mips/pci/msi-xlp.c
+++ b/arch/mips/pci/msi-xlp.c
@@ -245,14 +245,8 @@ static struct irq_chip xlp_msix_chip = {
        .irq_unmask     = unmask_msi_irq,
 };
 
-void destroy_irq(unsigned int irq)
-{
-           /* nothing to do yet */
-}
-
 void arch_teardown_msi_irq(unsigned int irq)
 {
-       destroy_irq(irq);
 }
 
 /*
@@ -348,10 +342,8 @@ static int xlp_setup_msi(uint64_t lnkbase, int node, int link,
 
        xirq = xirq + msivec;           /* msi mapped to global irq space */
        ret = irq_set_msi_desc(xirq, desc);
-       if (ret < 0) {
-               destroy_irq(xirq);
+       if (ret < 0)
                return ret;
-       }
 
        write_msi_msg(xirq, &msg);
        return 0;