summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/msi.c
diff options
context:
space:
mode:
authorDaniel Axtens <dja@axtens.net>2015-04-14 14:28:03 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2015-06-02 11:47:45 +1000
commit1f88d5860e0b8244b28e21b63a521915e5c15313 (patch)
tree53990950a012f4c796e830ccd85ff9c0adaec0fa /arch/powerpc/kernel/msi.c
parent14f95acda2f3238f3470beea0ddbf78081b3268d (diff)
downloadlinux-1f88d5860e0b8244b28e21b63a521915e5c15313.tar.bz2
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>
Diffstat (limited to 'arch/powerpc/kernel/msi.c')
-rw-r--r--arch/powerpc/kernel/msi.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c
index 3d452f71fa25..dab616a33b8d 100644
--- 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);
}