--- zzzz-none-000/linux-3.10.107/arch/mips/pci/pci-xlr.c 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/arch/mips/pci/pci-xlr.c 2021-02-04 17:41:59.000000000 +0000 @@ -214,14 +214,8 @@ } #ifdef CONFIG_PCI_MSI -void destroy_irq(unsigned int irq) -{ - /* nothing to do yet */ -} - void arch_teardown_msi_irq(unsigned int irq) { - destroy_irq(irq); } int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) @@ -263,12 +257,10 @@ MSI_DATA_DELIVERY_FIXED; ret = irq_set_msi_desc(irq, desc); - if (ret < 0) { - destroy_irq(irq); + if (ret < 0) return ret; - } - write_msi_msg(irq, &msg); + pci_write_msi_msg(irq, &msg); return 0; } #endif