Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6398325imu; Wed, 14 Nov 2018 00:25:47 -0800 (PST) X-Google-Smtp-Source: AJdET5fbvrM3FQ24uQ+V3XaNmmYDFeUcXWNN2L3azptJLMjSxZZC0so8jMUP08HTu0MAF8+CckrJ X-Received: by 2002:a63:2849:: with SMTP id o70mr857051pgo.155.1542183947311; Wed, 14 Nov 2018 00:25:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183947; cv=none; d=google.com; s=arc-20160816; b=greUizaXC2XAfqIpLNzoO5EZx9mw9d8n0wr2E2hZWgYlWGPSQd2OtR8T0FnyUNUaWc 83ulBdPAbH6r6OHOM1N2If8xJXpjvojwAlPj+mnXOqbd3WgQ/CATPYXHxthFbwngY6vh a1DK2RERASbtLI+UAvucit8dF8vuFo1eCv99ndeusTsWpvOKaeVHzMPEtN25JALg6UWv ScC2OWMMLNPYXEdfNcnMCVtU5xwDpWZ6JmVewxZBpnYQ6GiQbjVHj/daFX7tKhUVEXIx +5VYJQNTJK/51sR92Cmt81W2K8MaSKtADhzMDs93O2zuwDArnQaYUkPGbxxcTcYEed9H qtew== 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=H0saxhDp6rJuBqWOA33TJvKjzfKkNA2IskelexupIBA=; b=praN3SowXR+lbGs8JXtPG/d0kK7TcsvzCNlOzkfS8cgub1rH1OWYlUPiwpbnvWGr8s BXRmAog/buIZuZ+cC4d70lMDxLqNxytf6IXNa0LYFHOAOLbw1c+boZbbX+xdsb22OjZ0 5pJf0wnkm+nzF0Jx3jAID96aJucToKaizqB5S6/mYbiHFgVNSMD6LjyAaHcfPAz/rcxW cH8X5g4sBXJiumwpBR21br+PFnHIAywms/CP/ajCkTHAvF+SWLvFIFQLeyp6EOr/jImr yVPe/ipfuCNn6lB8LhU9L8Fax+Iqtv2p1Afx8ffgkc29XhM+weNI5gu8lRFSyLzaz2FE wjDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=CKaiLnQE; 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 y6-v6si24911813pfy.29.2018.11.14.00.25.32; Wed, 14 Nov 2018 00:25:47 -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=CKaiLnQE; 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 S1732984AbeKNS0v (ORCPT + 99 others); Wed, 14 Nov 2018 13:26:51 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:49966 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732891AbeKNS0u (ORCPT ); Wed, 14 Nov 2018 13:26:50 -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=H0saxhDp6rJuBqWOA33TJvKjzfKkNA2IskelexupIBA=; b=CKaiLnQEOD9tEV0YFo66TNwWfm 21d92M0nNcJGd1lrTo7bnINTwkqct4wMnf3bo/2pWnOhAM3YuJy/qTjgs45bgUY8t0F0q7ljG4N1E nB9Hjermv77M6i/11P9PpbJs1hArCKPF3RcvesHRdmX4s71iXmdZs7MBUvpcKqAi07NJ7p5zFh35K GiKGBrK3jm3Bo+/KX4M5bFtuXMQOLRXmoLRzBk0thXUpL8vCfsK9FQLmvBS8CSnn4/yZGu6Zzw81k yXCeQFf+DJW8hRuHQaKCIhhreB3CoKcYEW42b8Tfmekob2GOsZ+RcNsjIiBU4gS8EpKwnvC9O+bJ0 xYFsGjZA==; 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 1gMqT8-00050D-1e; Wed, 14 Nov 2018 08:24:14 +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 21/34] powerpc/pci: remove the dma_set_mask pci_controller ops methods Date: Wed, 14 Nov 2018 09:23:01 +0100 Message-Id: <20181114082314.8965-22-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 Unused now. Signed-off-by: Christoph Hellwig --- arch/powerpc/include/asm/pci-bridge.h | 2 -- arch/powerpc/kernel/dma.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index aace7033fa02..a50703af7db3 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -45,8 +45,6 @@ struct pci_controller_ops { void (*teardown_msi_irqs)(struct pci_dev *pdev); #endif - int (*dma_set_mask)(struct pci_dev *pdev, u64 dma_mask); - void (*shutdown)(struct pci_controller *hose); }; diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 154e1cdae7f9..829eb2fefc8c 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -279,13 +279,6 @@ int dma_set_mask(struct device *dev, u64 dma_mask) if (ppc_md.dma_set_mask) return ppc_md.dma_set_mask(dev, dma_mask); - if (dev_is_pci(dev)) { - struct pci_dev *pdev = to_pci_dev(dev); - struct pci_controller *phb = pci_bus_to_host(pdev->bus); - if (phb->controller_ops.dma_set_mask) - return phb->controller_ops.dma_set_mask(pdev, dma_mask); - } - if (!dev->dma_mask || !dma_supported(dev, dma_mask)) return -EIO; *dev->dma_mask = dma_mask; -- 2.19.1