aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev
diff options
context:
space:
mode:
authorDaniel Axtens <dja@axtens.net>2015-03-31 01:00:56 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-04-11 06:49:18 -0400
commit467efc2e4fdc44e6cd4be7dd4adf01c14b3d148e (patch)
treed8702b30db2eedb190e82beb802ac30275af6ea7 /arch/powerpc/sysdev
parent9c1368fc50e78ff862a05d1a0995ce44413c49e2 (diff)
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>
Diffstat (limited to 'arch/powerpc/sysdev')
-rw-r--r--arch/powerpc/sysdev/dart_iommu.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 120e96a9e2cb..87b80009bc9f 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -398,9 +398,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
398 if (controller_ops) { 398 if (controller_ops) {
399 controller_ops->dma_dev_setup = pci_dma_dev_setup_dart; 399 controller_ops->dma_dev_setup = pci_dma_dev_setup_dart;
400 controller_ops->dma_bus_setup = pci_dma_bus_setup_dart; 400 controller_ops->dma_bus_setup = pci_dma_bus_setup_dart;
401 } else {
402 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_dart;
403 ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
404 } 401 }
405 /* Setup pci_dma ops */ 402 /* Setup pci_dma ops */
406 set_pci_dma_ops(&dma_iommu_ops); 403 set_pci_dma_ops(&dma_iommu_ops);
@@ -412,8 +409,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
412 controller_ops->dma_dev_setup = NULL; 409 controller_ops->dma_dev_setup = NULL;
413 controller_ops->dma_bus_setup = NULL; 410 controller_ops->dma_bus_setup = NULL;
414 } 411 }
415 ppc_md.pci_dma_dev_setup = NULL;
416 ppc_md.pci_dma_bus_setup = NULL;
417 412
418 /* Setup pci_dma ops */ 413 /* Setup pci_dma ops */
419 set_pci_dma_ops(&dma_direct_ops); 414 set_pci_dma_ops(&dma_direct_ops);