These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / powerpc / kernel / msi.c

diff --git a/kernel/arch/powerpc/kernel/msi.c b/kernel/arch/powerpc/kernel/msi.c
index 71bd161..dab616a 100644 (file)
--- a/kernel/arch/powerpc/kernel/msi.c
+++ b/kernel/arch/powerpc/kernel/msi.c
@@ -15,7 +15,10 @@
 
 int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
-       if (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs) {
+       struct pci_controller *phb = pci_bus_to_host(dev->bus);
+
+       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;
        }
@@ -24,10 +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;
 
-       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)
 {
-       ppc_md.teardown_msi_irqs(dev);
+       struct pci_controller *phb = pci_bus_to_host(dev->bus);
+
+       phb->controller_ops.teardown_msi_irqs(dev);
 }