Skip to content

Commit

Permalink
powerpc: dart_iommu: Remove check for controller_ops == NULL case
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Axtens authored and Michael Ellerman committed Apr 11, 2015
1 parent 467efc2 commit 771e569
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions arch/powerpc/sysdev/dart_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 771e569

Please sign in to comment.