From patchwork Tue Oct 9 13:24:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10632541 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1A2113AA for ; Tue, 9 Oct 2018 13:26:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94B0F286A1 for ; Tue, 9 Oct 2018 13:26:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 890A0289C4; Tue, 9 Oct 2018 13:26:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BAC3286A1 for ; Tue, 9 Oct 2018 13:26:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26C686B027E; Tue, 9 Oct 2018 09:26:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1F4546B0280; Tue, 9 Oct 2018 09:26:12 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01BE16B0281; Tue, 9 Oct 2018 09:26:11 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id AE5636B027E for ; Tue, 9 Oct 2018 09:26:11 -0400 (EDT) Received: by mail-pl1-f200.google.com with SMTP id f17-v6so993483plr.1 for ; Tue, 09 Oct 2018 06:26:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FPvgBLtWHsWCoL0Sua1w8BYNtdVAHDwhlJY2AxROsgo=; b=Hpn0IBZl+L87BP5/+Mp0UAPe1wDrf1SrVte+E3m79uHE0OnedEbteMxG3OyP8lEBe4 9t/fbHCP2umItsEMoYTR/3dQbZO9p6RH1mePEH9CD3I43BSxA0+Apmz85jUlU0UsIAlA 2xdKNf2WA3lujkBG3U6cFcC30MTfT80UBpGD6f4J48QlM+IGnQIFj8dATSINd/Yd+NvO /Axp75AVOZ5IUHHzEGR9DU/xQohgfNHAsQ5NC+hAv5TFkzxfDYXVjnVCwiqCjNOoOWMx Bw2LIqp7pnq+xlKHdvMvkHfjfxrjriDGkxs4BYn8kGGPD6hCun2f8GHrmbGRcsq46bxB vlFw== X-Gm-Message-State: ABuFfohnKisjbW7oJq4f2YhrniHbxgdPgDJzXl5aqKyC0I9M+FX2XF/T Sy997TsJXgBlxUVxthou14FSi5hP2awLpH4g1oG4sEUhnJti1MYpTOadggA3L0h8CJLdIy6lseB ymF7dYKjjZD6clUXyWGiwvng5i6Vy/qi7xYH7z4m+gyKuoR1q8zQlQpSHm0/JN04= X-Received: by 2002:a65:4103:: with SMTP id w3-v6mr26043969pgp.284.1539091571396; Tue, 09 Oct 2018 06:26:11 -0700 (PDT) X-Google-Smtp-Source: ACcGV60aALdaHC9+6OwmPMtRzOZkp3gWa42yrA1QjQErx0qg2bU/DfpuWolP+Qk6N/ABi6Ygv/bV X-Received: by 2002:a65:4103:: with SMTP id w3-v6mr26043932pgp.284.1539091570786; Tue, 09 Oct 2018 06:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539091570; cv=none; d=google.com; s=arc-20160816; b=DGd0Hh6ePkDciQkDvcb5GrUFUu79sjcSdhwlqPqFPLM3bDQ9IzEAV4D6LWOwQYB5Fh hoW1HPgaR6iC1kC1Zdig8Pt0ub0VgeSQZ+jZk4mbbCZiX/TozVRa1zq6UyeDerY5TeJN a9u3RyJ0Cuxc4aa3gWbP5eJxsDwlp25/aLJSyg/DPddTduG5g7+jRUph1EvZDNzdxkZt RJoubKWYFbnatEgN6peLF8LNkqcebhC3E2fnu7vIiZc4elT69gxX2/VWmKifmTrxwIXf 08TspKC/HeIL1hJm0WO8sZRfwZtm+2mRbuvB6Gr1otzHGq6FnlN4AM47JyZEJAJgeM6u 7FIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=FPvgBLtWHsWCoL0Sua1w8BYNtdVAHDwhlJY2AxROsgo=; b=hhAdP060AbsWJazzsHSPViS/ZdhHYtsZj9RswOhOgnQFfA1kVannK87X+x+jSZqJyc vb3icp8GJ2jKlimUCBdjxyulXsi9ZdKZuHY5wFjLVdi1rGBaY7VlEKlMvJsPCNGSFRC2 wn6T8KCTQINmXyh0lEXgnyI/ayLgmS4AR+O9L8xGzMMI/Nn2ydBeRqqZuPP/7MS0Dpra 6olzq95XPpG7mT72C7F54nykCCqOLmt5xctl2qmLu1qzk4/GCcT78Y4vozWz7m1Fnefs gdUT9m4wpm6QTW1YQ3qHf2o82aMRxQIe55RWN0IYZcTMhGLwQP941GvR3mzyAHo0BPea ibaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=L2TSSbb+; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id 12-v6si17418829pgd.191.2018.10.09.06.26.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Oct 2018 06:26:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=L2TSSbb+; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=FPvgBLtWHsWCoL0Sua1w8BYNtdVAHDwhlJY2AxROsgo=; b=L2TSSbb+lOD59zteiXYTwFQ7Ma Dw0zO+HHGGmLlMqchBHV+WbkXMLMJO/7Uy00wg+DENtwWf5uVx1VA2umOZNklgKsr997KxO4HmbAp vJS01fFgWXBkFFJWtjQuxMCPpTYV3kHMi71E5ZzLXUa4ewHl7g1nk3LTV4s0cdrzzgozaunGWeJr3 TzEqp9+1gsNa5OLDunqPjsZCc6j0iAqKJn7BAtLUSX0wXX+0FQs/ALqt+q/pJaGpwRqWRjEmbyVkm y4p2LOdeUzMtLQJDiqlj+jTgGRWfvttHeBMeN1Tff4eX1rpU4tmstM20qKALPd9WrbnL+4Fkv+XmK E4rYwf/A==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1g9s0z-0001B1-3S; Tue, 09 Oct 2018 13:25:33 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/33] powerpc/dart: remove dead cleanup code in iommu_init_early_dart Date: Tue, 9 Oct 2018 15:24:40 +0200 Message-Id: <20181009132500.17643-14-hch@lst.de> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181009132500.17643-1-hch@lst.de> References: <20181009132500.17643-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 5ca3e22d0512..ce5dd2048f57 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