PCI/MSI/PPC: Remove arch_msi_check_device()

Move MSI checks from arch_msi_check_device() to arch_setup_msi_irqs().
This makes the code more compact and allows removing
arch_msi_check_device() from generic MSI code.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>

1 files changed, 3 insertions, 9 deletions

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 77efbaec7b9c..b32e79dbef4f 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -109,14 +109,6 @@ static int fsl_msi_init_allocator(struct fsl_msi *msi_data)
         return 0;
 }
 
-static int fsl_msi_check_device(struct pci_dev *pdev, int nvec, int type)
-{
-        if (type == PCI_CAP_ID_MSIX)
-                pr_debug("fslmsi: MSI-X untested, trying anyway.\n");
-
-        return 0;
-}
-
 static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
 {
         struct msi_desc *entry;
@@ -173,6 +165,9 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         struct msi_msg msg;
         struct fsl_msi *msi_data;
 
+        if (type == PCI_CAP_ID_MSIX)
+                pr_debug("fslmsi: MSI-X untested, trying anyway.\n");
+
         /*
          * If the PCI node has an fsl,msi property, then we need to use it
          * to find the specific MSI.
@@ -527,7 +522,6 @@ static int fsl_of_msi_probe(struct platform_device *dev)
         if (!ppc_md.setup_msi_irqs) {
                 ppc_md.setup_msi_irqs = fsl_setup_msi_irqs;
                 ppc_md.teardown_msi_irqs = fsl_teardown_msi_irqs;
-                ppc_md.msi_check_device = fsl_msi_check_device;
         } else if (ppc_md.setup_msi_irqs != fsl_setup_msi_irqs) {
                 dev_err(&dev->dev, "Different MSI driver already installed!\n");
                 err = -ENODEV;