powerpc: Remove shims for pci_controller_ops operations
Remove shims, patch callsites to use pci_controller_ops versions instead. Also move back the probe mode defines, as explained in the patch for pci_probe_mode. Signed-off-by: Daniel Axtens <dja@axtens.net> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
committed by
Michael Ellerman
parent
9c1368fc50
commit
467efc2e4f
@@ -398,9 +398,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
|
||||
if (controller_ops) {
|
||||
controller_ops->dma_dev_setup = pci_dma_dev_setup_dart;
|
||||
controller_ops->dma_bus_setup = pci_dma_bus_setup_dart;
|
||||
} else {
|
||||
ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_dart;
|
||||
ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
|
||||
}
|
||||
/* Setup pci_dma ops */
|
||||
set_pci_dma_ops(&dma_iommu_ops);
|
||||
@@ -412,8 +409,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
|
||||
controller_ops->dma_dev_setup = NULL;
|
||||
controller_ops->dma_bus_setup = NULL;
|
||||
}
|
||||
ppc_md.pci_dma_dev_setup = NULL;
|
||||
ppc_md.pci_dma_bus_setup = NULL;
|
||||
|
||||
/* Setup pci_dma ops */
|
||||
set_pci_dma_ops(&dma_direct_ops);
|
||||
|
||||
Reference in New Issue
Block a user