Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 771e569e authored by Daniel Axtens's avatar Daniel Axtens Committed by Michael Ellerman
Browse files

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: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 467efc2e

arch/powerpc/sysdev/dart_iommu.c

+5 −8
Original line number Diff line number Diff line
@@ -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;

	}



	/* 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;

	}



	/* Setup pci_dma ops */

	set_pci_dma_ops(&dma_direct_ops);