]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc/dart: remove dead cleanup code in iommu_init_early_dart
authorChristoph Hellwig <hch@lst.de>
Wed, 13 Feb 2019 07:01:10 +0000 (08:01 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 18 Feb 2019 11:41:02 +0000 (22:41 +1100)
If dart_init failed we didn't have a chance to setup dma or controller
ops yet, so there is no point in resetting them.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/sysdev/dart_iommu.c

index a5b40d1460f1a007df88ff75e63356778d76345d..283ce04c58443eb1d7ab9e605dc397a705680cdc 100644 (file)
@@ -428,7 +428,7 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
 
        /* Initialize the DART HW */
        if (dart_init(dn) != 0)
-               goto bail;
+               return;
 
        /* Setup bypass if supported */
        if (dart_is_u4)
@@ -439,15 +439,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
 
        /* Setup pci_dma ops */
        set_pci_dma_ops(&dma_iommu_ops);
-       return;
-
- bail:
-       /* If init failed, use direct iommu and null setup functions */
-       controller_ops->dma_dev_setup = NULL;
-       controller_ops->dma_bus_setup = NULL;
-
-       /* Setup pci_dma ops */
-       set_pci_dma_ops(&dma_nommu_ops);
 }
 
 #ifdef CONFIG_PM