Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6399422imu; Wed, 14 Nov 2018 00:27:21 -0800 (PST) X-Google-Smtp-Source: AJdET5dtfNtWxqQV2UThfAYrMmh0DWmzRUTMnbdxydTRkHyypkcVrRT+zsfPVvcLwrdKcJ5il8OP X-Received: by 2002:a17:902:a601:: with SMTP id u1mr963985plq.77.1542184041050; Wed, 14 Nov 2018 00:27:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542184041; cv=none; d=google.com; s=arc-20160816; b=EzRIyBPFWJtLqiIw9W2YPxu28scq1L+pzdj7nJB0MsfYpxrr4/rK1WzcRD3aHM1v/m JE+XGU7JWJZNAkwbssMrcb1l93mktWTy2Zrg4OjxVQ1kIgUsprNawRjQpL8WGU3wwEdM kSMvIQM6jGQUEM/PtD63kRF6Q4NugQy89xooJql9GDmJ+RvHG+65Ir0XbG2CudVqBHvk /WIa+xDt9sI1c6RAfadgyZOocDA7Q5p8YbOBiDn0z+He8VdtzZyejZjy9sdqw7bp2s3z FgKwKXKVHkgmO0iH77FXbWxxrwfKjakGVGJbgs6rLjiyE5HjP5XThpNwNg7g8fD7ktut +rtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/j3bQXpd/gVTqLpGersu6eVAWT1I+PIQi+24w5zL65w=; b=NXK98C032tqtz3j7Eaj43flQGvozkUX7AFv3MqaQz80s8LZmsQeJzukfk6y29ylHad 1VuD99q1xvEoQ2hT9gfUe4vzSd98hxNqrMg3aQRQqMgtknzWnxGg9gntTf/+a5BwcNvT i5JUlg9qxPc7FDjUAGaaAYtl/9URTH3YH1jM4+nRDN8cedqbxUTT21LH1Au50D7eE5ZY 0bsNnyVjb0+ImWvbZTlzzwckAEn8zPBMB2lH7g9WrtzahIjj6n2IcKwb6y3k8irLSZ8e w+UbP4isGDMY+ZQ8QHziU5L2tkXo9PtkcghtnjuppSr5+EE9P3iL3kRBWHCV7zvWrnZf +t9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=PjzF40cG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 19si21933614pgp.186.2018.11.14.00.27.06; Wed, 14 Nov 2018 00:27:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=PjzF40cG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732799AbeKNS0c (ORCPT + 99 others); Wed, 14 Nov 2018 13:26:32 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:49748 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728406AbeKNS0c (ORCPT ); Wed, 14 Nov 2018 13:26:32 -0500 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=/j3bQXpd/gVTqLpGersu6eVAWT1I+PIQi+24w5zL65w=; b=PjzF40cGj9fpFDaBgEFmomV4Xu W7i50ILLZCiy79xRnCNJkggV4KMgN574dqWZGq6KGQJDvaJh5WGsZ6Jj35QWgA21cPpWfeacwD3tO WMIi0YV96jtexDyizT9oC+Jv2tlA4JGMVZh9Zkd1O2lNgLCFixwyu7sc4NkVej9KnbHQqKE0WnYnJ 7MvANHPcRGcQG+HFMAXaNv/ypeuT16Yg94kzhNTEjh6y1ETy7qGf+0NyoZ0iqZ9yXuAQAWf6yXSiX n1kJlpobcPJUTqlt/eXrTepODHGpdOPLxryJ5xf4s7C869URkZs5qNijL3l0pCPTH0pE+GvCb9Z1x oe6NyBZA==; Received: from 089144211136.atnat0020.highway.a1.net ([89.144.211.136] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMqSo-0004t9-VK; Wed, 14 Nov 2018 08:23:55 +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 14/34] powerpc/dart: remove dead cleanup code in iommu_init_early_dart Date: Wed, 14 Nov 2018 09:22:54 +0100 Message-Id: <20181114082314.8965-15-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114082314.8965-1-hch@lst.de> References: <20181114082314.8965-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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