1 files changed, 1 insertions, 10 deletions

diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index a5b40d1460f1..283ce04c5844 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -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