Message ID | 20181009132500.17643-20-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 CAE4E112B for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 9 Oct 2018 13:26:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF6CF289C4 for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 9 Oct 2018 13:26:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B3806289F5; Tue, 9 Oct 2018 13:26:49 +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 2E504289C4 for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 9 Oct 2018 13:26:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BCB16B028B; Tue, 9 Oct 2018 09:26:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8CF0F6B028A; Tue, 9 Oct 2018 09:26:15 -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 75C5F6B0289; Tue, 9 Oct 2018 09:26:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 282F96B0284 for <linux-mm@kvack.org>; Tue, 9 Oct 2018 09:26:15 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id v138-v6so837352pgb.7 for <linux-mm@kvack.org>; Tue, 09 Oct 2018 06:26:15 -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=0t8uXkuelOQDt36xt585mgrdkG+i2UBH2mxJX+JCUK8=; b=c477wGMDjTeyDxYwvBpC0RPtuXWph7GmmGbUK/ZQwM2pZZmMVKAYtl0HRne4VFcD8b UqPl9UFQXHqSWXrIuCZzKFDqhVqrx3F06HHEVqGevZSDU+Vpvm63GLMo2pKWO7/kJbUe cC1CLKGvZRZmqS1YFQNx1zydUKMYsJVxDJsS/krr1fBDU4tKSIl35aSQSICSLBmeALa+ 0h5veLGDpm/qCyeChUEDPhhPmFsWYVp71qsHVY5O67c2cZCHo065qbMiXqwP/21n+GEH m/Q+/Qgbt9Coyu0bX7ptb6mecqrQ4RimPZBsVfc5FHoQM++DmX8GI5GVHmRBQQb7j6Ls iGTw== X-Gm-Message-State: ABuFfojWAu7rHaaqXZirnERzfNbOnDicKWl3kD7vTG+VNtz02TDfb3Sl xchg53O503oltlAb5DoYV4xNa3WRN7441lLkxDIFVU37I+6/7CrOm1YHqsArMeixcomqMFaq+Rb 4lRgq6G4TA31/gd4EN4dik9qy7IDmQDrDlew0m/Z3cAMFHl+yOEq/8ESBuKn5IXI= X-Received: by 2002:a17:902:9f8c:: with SMTP id g12-v6mr29369058plq.309.1539091574851; Tue, 09 Oct 2018 06:26:14 -0700 (PDT) X-Google-Smtp-Source: ACcGV61/nb/RbeB0Liw1edYLvH9+Otb8cF5LPPT6iRptBbpcIzgiGSLfPt9NiMQpbZXqgcCbcIUD X-Received: by 2002:a17:902:9f8c:: with SMTP id g12-v6mr29369026plq.309.1539091574205; Tue, 09 Oct 2018 06:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539091574; cv=none; d=google.com; s=arc-20160816; b=UI4EsYsnz1A7waebmzg/PqZAi45zVV2B0nwBI/oDH8DD9kFe+gt5AyVzxwGQNSsQ/n OwfGUstd4thudSIFOGiJ4YwoLCOFG2EuzzrybU0Itq/U9GCqpwPSmGyJqHXhESMDsurs ZbApiyQ8salWG7BG0ptIREASLKO5YJe6TvgSF/CUXu8VfS8NCUfsqhgVPb2j1B7ahaz/ yIwnkGIdH/amvbsvubulAtxK9TWtSYw//a/MzJK3BWYhzokPLcjhLY/7Yc8fN0Uc7hp6 qRKVRBb9Fw+7chVsIYXzjvWwEfVgvLGGPLsPeyFB8DB8/lQnmcUXBA8qFDrovmpyT6j5 Q5jQ== 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=0t8uXkuelOQDt36xt585mgrdkG+i2UBH2mxJX+JCUK8=; b=BF+RHRo2548btOFMg3E0SaB5lZL/DhknSIhygP0im5OgglkHIRbm8GJO01IdCBWmtr IEUblnfsl6C//zxc8z1HlD39juHCJnJVfLTeIZ6D9bCKt3+yczupDAtsd1uZViO9Adwg PjqjeSmUvs56tse1zh2kpMc9UGTfmAB9m4hTFFkk3PdBJyV7m3s2a4cqLrKULepEZqmz 8RTlRRToaX+VrpGBShdZR3EzzoqtugJsaNnRKxKpM5mVRsnOxNfsCeMTdKsWzP0rzSVL TnKsqBC0ar71tlEO4SHEFIJKdSofse1qrCsoS1r9YKu4jEdpLEuGJ1osCp4sAIfoLGJY GBGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=YmOYnw6K; 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 1-v6si23159884plt.148.2018.10.09.06.26.14 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Oct 2018 06:26:14 -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=YmOYnw6K; 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=0t8uXkuelOQDt36xt585mgrdkG+i2UBH2mxJX+JCUK8=; b=YmOYnw6K8pYKh46DlaXiP9du+b 5GRswt6ZMjT5iH0UHH0fnBR2oIkaZx+XNktI7dC32Hl9G84c6pIothfhz67xcKMsjKaOT4AV5BrSt TzawuqnfVChIJFIUPIbypeHUoQgKQECbWUJg1GN+jo2GhEW3kUOtgNfxoXUat/vCTdhATygly1oik DgLzQyWbQ+vw/wXKkla0dQd3CfpeG9aGnOwPIf+DP62SMB4Nfe4fat2YERucjmhu7oezk8sKsxd+j mFAuuU0OIQaO/QEg33Fgiri7cgCR4aaa40h6AdG7Yuut+yhOj6YVTQwqKUC54jPtP5tFuJ0yPhVbJ FRB8eCxQ==; 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 1g9s1F-0001Ip-TO; Tue, 09 Oct 2018 13:25:50 +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 19/33] powerpc/pci: remove the dma_set_mask pci_controller ops methods Date: Tue, 9 Oct 2018 15:24:46 +0200 Message-Id: <20181009132500.17643-20-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 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/33] 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 9ca9d2cec4ed..78ef4076e15c 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -267,13 +267,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(-)