Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp4867430imm; Tue, 9 Oct 2018 06:30:12 -0700 (PDT) X-Google-Smtp-Source: ACcGV62qcVDWxphYJy08ya0GbX9KVFxZsey7OEpKq4deUMj0b/2Y/ufNurMzG4F7Jxf7pbGVeoH5 X-Received: by 2002:a65:638a:: with SMTP id h10-v6mr1927578pgv.136.1539091812791; Tue, 09 Oct 2018 06:30:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539091812; cv=none; d=google.com; s=arc-20160816; b=olZ+okeQ85i3dcNGoqeqp5vXgYNFyl+ks6Cx8NpE6KYgf7p9CGE+kE0urKFZGZXLi5 0gxpq2lV3qCJhvWVkFhPv9f1ZmgAVkrc8LTgB686oMu9dj4VqlRJ6c09L/ljmep+rVHF Np1r5nV1yQ9BguDGHyBzgr/ZS9QyFBj8ae/KbXc+SvblNbyxFtZ9TQDYgdTjsCkNk1si lsn1RHHabbB7jSkpcmZx4UXsq7xWmYTDirULAt0k/zhQARXPeM0ODOIdHRzfwzH9zqut Zr6Wfu+gUd/bG68WQNTW4pcK67WEgEHbsFEaKe1LUWL4UUH1yhBB03OABBp1AueSi1uG Gw3Q== 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=0t8uXkuelOQDt36xt585mgrdkG+i2UBH2mxJX+JCUK8=; b=MsS2O5iKyMrhP38hjXBnFq4Kkejvhf/+wuXE3bP2gjelGOyZ4X8L3b9eRByVw1BYXf t88yl9qr/X7103VngZpkcYx7TNFwpsnNajldsMHW/gYUGR+kVdRoOG8d1s56PLKFU2DA Ga2+Q0vUoDsNV7yB0/7WDudpGmf//IwSOOnfH8161UU0vRaMZTxzy3JP3Q01i0PI7uvk R2zPszpLUcf+iz4a4H2n1qVHFpOKSna21tyA3x7jTusgm5DqInBN1g9Bqo+WC2XNMfzz Mwj9SX46s7BZ8/pKHgqso0z3qVnLR+gkDJ6CKNyvmQ14S/q+l7X5Zy67TdLPEs1y21gs 4lRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=YmOYnw6K; 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 be12-v6si2709305plb.347.2018.10.09.06.29.57; Tue, 09 Oct 2018 06:30:12 -0700 (PDT) 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=YmOYnw6K; 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 S1727536AbeJIUnM (ORCPT + 99 others); Tue, 9 Oct 2018 16:43:12 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:49594 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727476AbeJIUnK (ORCPT ); Tue, 9 Oct 2018 16:43:10 -0400 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 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 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 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 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; -- 2.19.0