lkml.org 
[lkml]   [2018]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 14/34] powerpc/dart: remove dead cleanup code in iommu_init_early_dart
    ping?

    On Wed, Nov 14, 2018 at 09:22:54AM +0100, Christoph Hellwig wrote:
    > 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>
    > ---
    > arch/powerpc/sysdev/dart_iommu.c | 11 +----------
    > 1 file changed, 1 insertion(+), 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
    > --
    > 2.19.1
    >
    > _______________________________________________
    > iommu mailing list
    > iommu@lists.linux-foundation.org
    > https://lists.linuxfoundation.org/mailman/listinfo/iommu
    ---end quoted text---

    \
     
     \ /
      Last update: 2018-12-06 15:12    [W:3.861 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site