MIPS: Octeon: Use arch_setup_msi_irq()

The core code provides the same loop code except for the MSI-X reject. Move
that to arch_setup_msi_irq() and remove the duplicated code.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://lore.kernel.org/r/20211206210224.319201379@linutronix.de

diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c
index 288b58b00dc84537fd1d49f43da0ecd3db02aefd..c2860ebbd8637f96600224bbc9d7d7c31acff794 100644 (file)
--- a/arch/mips/pci/msi-octeon.c
+++ b/arch/mips/pci/msi-octeon.c
@@ -68,6 +68,9 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
        u64 search_mask;
        int index;
 
+       if (desc->pci.msi_attrib.is_msix)
+               return -EINVAL;
+
        /*
         * Read the MSI config to figure out how many IRQs this device
         * wants.  Most devices only want 1, which will give
@@ -182,35 +185,6 @@ msi_irq_allocated:
        return 0;
 }
 
-int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
-{
-       struct msi_desc *entry;
-       int ret;
-
-       /*
-        * MSI-X is not supported.
-        */
-       if (type == PCI_CAP_ID_MSIX)
-               return -EINVAL;
-
-       /*
-        * If an architecture wants to support multiple MSI, it needs to
-        * override arch_setup_msi_irqs()
-        */
-       if (type == PCI_CAP_ID_MSI && nvec > 1)
-               return 1;
-
-       for_each_pci_msi_entry(entry, dev) {
-               ret = arch_setup_msi_irq(dev, entry);
-               if (ret < 0)
-                       return ret;
-               if (ret > 0)
-                       return -ENOSPC;
-       }
-
-       return 0;
-}
-
 /**
  * Called when a device no longer needs its MSI interrupts. All
  * MSI interrupts for the device are freed.