diff options
author | Christoph Hellwig <hch@lst.de> | 2019-02-13 02:01:10 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-18 06:41:02 -0500 |
commit | ee69049e00c2b2ade9b8e3d4d0e69ccf00af91df (patch) | |
tree | 4b224a42a60bb3a4a90b99b1929f7290ca00cea6 | |
parent | ba767b5283c06e1a2fcdd1835c33e42b8fccd09c (diff) |
powerpc/dart: remove dead cleanup code in iommu_init_early_dart
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>
-rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 11 |
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) | |||
428 | 428 | ||
429 | /* Initialize the DART HW */ | 429 | /* Initialize the DART HW */ |
430 | if (dart_init(dn) != 0) | 430 | if (dart_init(dn) != 0) |
431 | goto bail; | 431 | return; |
432 | 432 | ||
433 | /* Setup bypass if supported */ | 433 | /* Setup bypass if supported */ |
434 | if (dart_is_u4) | 434 | if (dart_is_u4) |
@@ -439,15 +439,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops) | |||
439 | 439 | ||
440 | /* Setup pci_dma ops */ | 440 | /* Setup pci_dma ops */ |
441 | set_pci_dma_ops(&dma_iommu_ops); | 441 | set_pci_dma_ops(&dma_iommu_ops); |
442 | return; | ||
443 | |||
444 | bail: | ||
445 | /* If init failed, use direct iommu and null setup functions */ | ||
446 | controller_ops->dma_dev_setup = NULL; | ||
447 | controller_ops->dma_bus_setup = NULL; | ||
448 | |||
449 | /* Setup pci_dma ops */ | ||
450 | set_pci_dma_ops(&dma_nommu_ops); | ||
451 | } | 442 | } |
452 | 443 | ||
453 | #ifdef CONFIG_PM | 444 | #ifdef CONFIG_PM |