powerpc: Remove MSI-related PCI controller ops from ppc_md

Remove unneeded ppc_md functions. Patch callsites to use pci_controller_ops
functions exclusively.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index ef8899432ae72dd0f91359cfba7e74d3c162b620..0d387d0570cdb15a6decb675745674f98c021882 100644 (file)
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -131,12 +131,6 @@ struct machdep_calls {
        /* To setup PHBs when using automatic OF platform driver for PCI */
        int             (*pci_setup_phb)(struct pci_controller *host);
 
-#ifdef CONFIG_PCI_MSI
-       int             (*setup_msi_irqs)(struct pci_dev *dev,
-                                         int nvec, int type);
-       void            (*teardown_msi_irqs)(struct pci_dev *dev);
-#endif
-
        void            (*restart)(char *cmd);
        void            (*halt)(void);
        void            (*panic)(char *str);

diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c
index 3d452f71fa2515ba3cc2897568e1a9362c1396a4..dab616a33b8dbe283aa46c05b5492af69190650f 100644 (file)
--- a/arch/powerpc/kernel/msi.c
+++ b/arch/powerpc/kernel/msi.c
@@ -17,9 +17,8 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
        struct pci_controller *phb = pci_bus_to_host(dev->bus);
 
-       if ((!phb->controller_ops.setup_msi_irqs ||
-            !phb->controller_ops.teardown_msi_irqs) &&
-           (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs)) {
+       if (!phb->controller_ops.setup_msi_irqs ||
+           !phb->controller_ops.teardown_msi_irqs) {
                pr_debug("msi: Platform doesn't provide MSI callbacks.\n");
                return -ENOSYS;
        }
@@ -28,18 +27,12 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
        if (type == PCI_CAP_ID_MSI && nvec > 1)
                return 1;
 
-       if (phb->controller_ops.setup_msi_irqs)
-               return phb->controller_ops.setup_msi_irqs(dev, nvec, type);
-       else
-               return ppc_md.setup_msi_irqs(dev, nvec, type);
+       return phb->controller_ops.setup_msi_irqs(dev, nvec, type);
 }
 
 void arch_teardown_msi_irqs(struct pci_dev *dev)
 {
        struct pci_controller *phb = pci_bus_to_host(dev->bus);
 
-       if (phb->controller_ops.teardown_msi_irqs)
-               phb->controller_ops.teardown_msi_irqs(dev);
-       else
-               ppc_md.teardown_msi_irqs(dev);
+       phb->controller_ops.teardown_msi_irqs(dev);
 }