powerpc: Create pci_controller_ops.probe_mode and shim

[mirror_ubuntu-zesty-kernel.git] / arch / powerpc / kernel / pci-common.c

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 2a525c938158e7937445837ef6448354b5147758..b0de23c89ca58b98d1b189b4bf4ea0adbe38e68d 100644 (file)
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -76,7 +76,7 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
        list_add_tail(&phb->list_node, &hose_list);
        spin_unlock(&hose_spinlock);
        phb->dn = dev;
-       phb->is_dynamic = mem_init_done;
+       phb->is_dynamic = slab_is_available();
 #ifdef CONFIG_PPC64
        if (dev) {
                int nid = of_node_to_nid(dev);
@@ -953,8 +953,7 @@ void pcibios_setup_bus_self(struct pci_bus *bus)
                ppc_md.pcibios_fixup_bus(bus);
 
        /* Setup bus DMA mappings */
-       if (ppc_md.pci_dma_bus_setup)
-               ppc_md.pci_dma_bus_setup(bus);
+       pci_dma_bus_setup(bus);
 }
 
 static void pcibios_setup_device(struct pci_dev *dev)
@@ -969,8 +968,7 @@ static void pcibios_setup_device(struct pci_dev *dev)
        set_dma_offset(&dev->dev, PCI_DRAM_OFFSET);
 
        /* Additional platform DMA/iommu setup */
-       if (ppc_md.pci_dma_dev_setup)
-               ppc_md.pci_dma_dev_setup(dev);
+       pci_dma_dev_setup(dev);
 
        /* Read default IRQs and fixup if necessary */
        pci_read_irq_line(dev);
@@ -1451,7 +1449,7 @@ EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
        if (ppc_md.pcibios_enable_device_hook)
-               if (ppc_md.pcibios_enable_device_hook(dev))
+               if (!ppc_md.pcibios_enable_device_hook(dev))
                        return -EINVAL;
 
        return pci_enable_resources(dev, mask);
@@ -1624,8 +1622,8 @@ void pcibios_scan_phb(struct pci_controller *hose)
 
        /* Get probe mode and perform scan */
        mode = PCI_PROBE_NORMAL;
-       if (node && ppc_md.pci_probe_mode)
-               mode = ppc_md.pci_probe_mode(bus);
+       if (node)
+               mode = pci_probe_mode(bus);
        pr_debug("    probe mode: %d\n", mode);
        if (mode == PCI_PROBE_DEVTREE)
                of_scan_bus(node, bus);