aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Axtens <dja@axtens.net>2015-03-31 01:00:57 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-04-11 06:49:19 -0400
commit771e569e8200ab6f5cdbcd6513f7a476718bb44d (patch)
tree8c99282b32278d48f7d5b6bfbcec5384b7202882
parent467efc2e4fdc44e6cd4be7dd4adf01c14b3d148e (diff)
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>
-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 87b80009bc9f..d00a5663e312 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)
395 if (dart_is_u4) 395 if (dart_is_u4)
396 ppc_md.dma_set_mask = dart_dma_set_mask; 396 ppc_md.dma_set_mask = dart_dma_set_mask;
397 397
398 if (controller_ops) { 398 controller_ops->dma_dev_setup = pci_dma_dev_setup_dart;
399 controller_ops->dma_dev_setup = pci_dma_dev_setup_dart; 399 controller_ops->dma_bus_setup = pci_dma_bus_setup_dart;
400 controller_ops->dma_bus_setup = pci_dma_bus_setup_dart; 400
401 }
402 /* Setup pci_dma ops */ 401 /* Setup pci_dma ops */
403 set_pci_dma_ops(&dma_iommu_ops); 402 set_pci_dma_ops(&dma_iommu_ops);
404 return; 403 return;
405 404
406 bail: 405 bail:
407 /* If init failed, use direct iommu and null setup functions */ 406 /* If init failed, use direct iommu and null setup functions */
408 if (controller_ops) { 407 controller_ops->dma_dev_setup = NULL;
409 controller_ops->dma_dev_setup = NULL; 408 controller_ops->dma_bus_setup = NULL;
410 controller_ops->dma_bus_setup = NULL;
411 }
412 409
413 /* Setup pci_dma ops */ 410 /* Setup pci_dma ops */
414 set_pci_dma_ops(&dma_direct_ops); 411 set_pci_dma_ops(&dma_direct_ops);