1 files changed, 11 insertions, 17 deletions

diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 9a7aa0ed9c1c..623d7fba15b4 100644
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -105,22 +105,6 @@ static u64 find_u4_magic_addr(struct pci_dev *pdev, unsigned int hwirq)
         return 0;
 }
 
-static int u3msi_msi_check_device(struct pci_dev *pdev, int nvec, int type)
-{
-        if (type == PCI_CAP_ID_MSIX)
-                pr_debug("u3msi: MSI-X untested, trying anyway.\n");
-
-        /* If we can't find a magic address then MSI ain't gonna work */
-        if (find_ht_magic_addr(pdev, 0) == 0 &&
-            find_u4_magic_addr(pdev, 0) == 0) {
-                pr_debug("u3msi: no magic address found for %s\n",
-                         pci_name(pdev));
-                return -ENXIO;
-        }
-
-        return 0;
-}
-
 static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
 {
         struct msi_desc *entry;
@@ -146,6 +130,17 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         u64 addr;
         int hwirq;
 
+        if (type == PCI_CAP_ID_MSIX)
+                pr_debug("u3msi: MSI-X untested, trying anyway.\n");
+
+        /* If we can't find a magic address then MSI ain't gonna work */
+        if (find_ht_magic_addr(pdev, 0) == 0 &&
+            find_u4_magic_addr(pdev, 0) == 0) {
+                pr_debug("u3msi: no magic address found for %s\n",
+                         pci_name(pdev));
+                return -ENXIO;
+        }
+
         list_for_each_entry(entry, &pdev->msi_list, list) {
                 hwirq = msi_bitmap_alloc_hwirqs(&msi_mpic->msi_bitmap, 1);
                 if (hwirq < 0) {
@@ -202,7 +197,6 @@ int mpic_u3msi_init(struct mpic *mpic)
         WARN_ON(ppc_md.setup_msi_irqs);
         ppc_md.setup_msi_irqs = u3msi_setup_msi_irqs;
         ppc_md.teardown_msi_irqs = u3msi_teardown_msi_irqs;
-        ppc_md.msi_check_device = u3msi_msi_check_device;
 
         return 0;
 }