summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev
diff options
context:
space:
mode:
authorDaniel Axtens <dja@axtens.net>2015-03-31 16:00:57 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2015-04-11 20:49:19 +1000
commit771e569e8200ab6f5cdbcd6513f7a476718bb44d (patch)
tree8c99282b32278d48f7d5b6bfbcec5384b7202882 /arch/powerpc/sysdev
parent467efc2e4fdc44e6cd4be7dd4adf01c14b3d148e (diff)
downloadop-kernel-dev-771e569e8200ab6f5cdbcd6513f7a476718bb44d.zip
op-kernel-dev-771e569e8200ab6f5cdbcd6513f7a476718bb44d.tar.gz
powerpc: dart_iommu: Remove check for controller_ops == NULL case
Now that we have ported the calls to iommu_init_early_dart to always supply a pci_controller_ops struct, we can safely drop the check. 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.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 87b8000..d00a5663 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -395,20 +395,17 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
if (dart_is_u4)
ppc_md.dma_set_mask = dart_dma_set_mask;
- if (controller_ops) {
- controller_ops->dma_dev_setup = pci_dma_dev_setup_dart;
- controller_ops->dma_bus_setup = pci_dma_bus_setup_dart;
- }
+ controller_ops->dma_dev_setup = pci_dma_dev_setup_dart;
+ controller_ops->dma_bus_setup = pci_dma_bus_setup_dart;
+
/* Setup pci_dma ops */
set_pci_dma_ops(&dma_iommu_ops);
return;
bail:
/* If init failed, use direct iommu and null setup functions */
- if (controller_ops) {
- controller_ops->dma_dev_setup = NULL;
- controller_ops->dma_bus_setup = NULL;
- }
+ controller_ops->dma_dev_setup = NULL;
+ controller_ops->dma_bus_setup = NULL;
/* Setup pci_dma ops */
set_pci_dma_ops(&dma_direct_ops);
OpenPOWER on IntegriCloud