Message ID | 20181114082314.8965-22-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 9810C14BA for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D9C52A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 810422B020; Wed, 14 Nov 2018 08:24:54 +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 0C28A2A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 90E096B028E; Wed, 14 Nov 2018 03:24:40 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 896726B028F; Wed, 14 Nov 2018 03:24:40 -0500 (EST) 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 712616B0290; Wed, 14 Nov 2018 03:24:40 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 287756B028E for <linux-mm@kvack.org>; Wed, 14 Nov 2018 03:24:40 -0500 (EST) Received: by mail-pl1-f199.google.com with SMTP id o10-v6so7287919plk.16 for <linux-mm@kvack.org>; Wed, 14 Nov 2018 00:24:40 -0800 (PST) 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=H0saxhDp6rJuBqWOA33TJvKjzfKkNA2IskelexupIBA=; b=poaRaPh1o/2dGQmjhbQYTvtXf2fTSRhNgKDANEzHgU0mvrFV9Rq/0M52DpfzB2Vn6V CpmEZ6E0lJdoPy4K6W1Z/zQ7haTFwHzlxwV3qE7Uc9TkVXmqVYIJcIRrKusSJOr9gMTy AVy64nUUSWrWOTpOqyW7F7TveGPj2JwsyTQ3LgDc3QQ779quUoggCq3IK5lBmXbioHH3 ANUAcCUIOU0i5seOzHa8QpkBKf2foU7xKJnAY2QAtvCp9QiA56JTYdy2Rti6/3XdUTCX Y52aXcW3XEMJo0zLh1W49kH0XWHGUtN8PmRmAOI03D6zSsVufIABc4mPrPt7lFzexd8w kSpg== X-Gm-Message-State: AGRZ1gIK4KNfFZCWhnbSdd4pejXzKr/Zf+SUfsg1A3c28NfR4SHnduZQ /NXHnOgJ0xqrw4LjzjIlcAqib0Lb4Az8C+9hAlxENhnNPPMG/74e8gLr6GYvgx45IYlyVgoUkOI Mv1Jl7ocWhAE6AKiZeYPQad6yAMkeWu6Xr3i9Hph2D+PLsdN8nWtDe7pxOHQlsfs= X-Received: by 2002:a63:741:: with SMTP id 62mr860730pgh.352.1542183879824; Wed, 14 Nov 2018 00:24:39 -0800 (PST) X-Google-Smtp-Source: AJdET5e3ujQmttyctoitNsh/k1IpmSXmBNGiFknz/+QVlWFVOd25ynUUwoHoVPWv7vtkMeFVRi1J X-Received: by 2002:a63:741:: with SMTP id 62mr860706pgh.352.1542183878956; Wed, 14 Nov 2018 00:24:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183878; cv=none; d=google.com; s=arc-20160816; b=NmTdKa0hinZx9wJEQCclYaVbAiZy6oroWbel01bE9o/fKHa+aonl5O0YQ38NHtJXtt ldbfB+DyqK+ME+NCMZXUXrly+PWqetK25NMVcmgJ1t36Xx3tWus14Onk27kgwLC32xi5 WBT55FAl6plcUTGGIFeLtmrtqIPspphiTyVRjysQXyp2QjWKIHUxlkLH4WG1SvAo2otG OD1RLsuDhQZGyLYTTAFTh8jfd7tsD7cCUJuHEeIo80I/hCsKaK2w5lnZmecIeM2ZhbRS ADLFGHqfna4mWKJu8z/guPcxgYPeMCjWJJ8Zijo40cS+csGAmd541/m9x5Jf0xI8mgN8 YoJw== 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=H0saxhDp6rJuBqWOA33TJvKjzfKkNA2IskelexupIBA=; b=MLLBkQFy1u5IlD3fNhyl2Gc8Wb7LtJBGU84bmlCn69ZhI/7wfalGSC3HPWCAdjcwuB +lj6jYy4EV+M3wrlViPMNCyZ0NtCQfhnRHAIafQml2SXySpm9Ds2IsoyYnpP5nhWc2f/ 3eUSKsT1rESkoW1mz3WDk9VHCtr310+tH9XgjlPU7UVgBaY2gox9tnXZbPlRp2ZzU//k NnMclwh+bbEDbKYey9SzPqvQOHzrLrO9CV2P4a1vhEUmqKN+JGRYmabyS0sQ9Me7DFFb YD0CxY9EqO2NlS7td4nm6vgew53v8t1tjzz4yHwguE1oLbL+uJ8lrlUMU1nmvqUZwEcG v93g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=CKaiLnQE; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+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 u25si23884775pgm.532.2018.11.14.00.24.38 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:24:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+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=CKaiLnQE; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+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=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 <hch@lst.de> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au> 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 <hch@infradead.org> 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: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[01/34] powerpc: use mm zones more sensibly
|
expand
|
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;
Unused now. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/powerpc/include/asm/pci-bridge.h | 2 -- arch/powerpc/kernel/dma.c | 7 ------- 2 files changed, 9 deletions(-)