diff options
| author | Daniel Axtens | 2015-03-31 07:00:56 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2015-04-11 12:49:18 +0200 |
| commit | 467efc2e4fdc44e6cd4be7dd4adf01c14b3d148e (patch) | |
| tree | d8702b30db2eedb190e82beb802ac30275af6ea7 /arch/powerpc/sysdev | |
| parent | powerpc/cell: Move controller ops from ppc_md to controller_ops (diff) | |
| download | kernel-qcow2-linux-467efc2e4fdc44e6cd4be7dd4adf01c14b3d148e.tar.gz kernel-qcow2-linux-467efc2e4fdc44e6cd4be7dd4adf01c14b3d148e.tar.xz kernel-qcow2-linux-467efc2e4fdc44e6cd4be7dd4adf01c14b3d148e.zip | |
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.c | 5 |
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) 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); |