Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp4839627imj; Wed, 13 Feb 2019 01:54:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ2mOpTqxrWi1iMP+gkYAO9NZ/weAxeME/fa3aL+TE2mBkN4V7SOOnuAtAblsCnCCwAw6mg X-Received: by 2002:a17:902:6bc3:: with SMTP id m3mr8852298plt.24.1550051654007; Wed, 13 Feb 2019 01:54:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550051653; cv=none; d=google.com; s=arc-20160816; b=QgU4oirpl8NOyUNwr3jEJ8oK2whRORbCVPg+9DcuTQzkOyjTI+t43+DcQdHBfoHucx mOoBwMBLiu7LkVAdeqg5EjF/ys31ecVevwvzSNAIBcS5Y0I3Q/Y02VNE10F+TZTrW5sY iXErjvaybc9i74hWb8fHQEt0qXrGKyUkiGnzrg3TYCkBfqi/2AznRNXTWEXfXGUa3P5a p2Bk25908+yEv5+FQJtYmSnRvBQpRslk3UuNvL+J40ZFf76HzSeAgaG70d609nBYfXQ6 AUL+Ipzs8w67YcUSw0g1mPn3/WxFCJGVlafXaDSXBFx0By1UjEmF55gtSrOsNKdula1W IppQ== 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=UNth3gGEzfO2YRqAVos53dQJ1BpypqC0w85Hh2Fn61I=; b=oqkHWwzhWA0D5jk/E4Tp3ANygzgjPggfvsgPFAOP4Lnh+QNlzxTW41ZqET0l2sfb/Q ewox0lZlrh4GMSyJKnEdWM7q5VY9rdnNFuZiyvgcBn7/dVAyoS/4hagBaCDvb7XsH2AW UfQpd5zdJvzDcFBArxpJSLZKCdhnB9kOZ0qprb6JpNXVtv/mHj68qzpWznSqIUekNm6U BsLLSbX8id8UUZv+6yML56pa9jA/k2X4JeYBhCQ4y90TytYPnKZW1l44yiwdbXH4Slhp yc2VApK3hWxVNVxbK18B63HglmJCZ5VuChaTiO/beTby9WdK28e8cDnDIwW0+7i+qrpj WfNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=amiOozUE; 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 d1si342243pls.164.2019.02.13.01.53.58; Wed, 13 Feb 2019 01:54:13 -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=amiOozUE; 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 S2388465AbfBMHCc (ORCPT + 99 others); Wed, 13 Feb 2019 02:02:32 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:51142 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388109AbfBMHC3 (ORCPT ); Wed, 13 Feb 2019 02:02:29 -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=UNth3gGEzfO2YRqAVos53dQJ1BpypqC0w85Hh2Fn61I=; b=amiOozUExFEIpuqDhhtsAGdiim ou0eSfheWtT4EVYv6da6GZokZErXFtvAqFnCAcT1pCI+w5kXA4tmNzIHphM5Kuf/PVU8v7zWVfuaE AJuwKNlWDSbFMVeYs/OPKfgbYRUFdsmSJ/pjWvQ/THondkgx+2NfEzs5NUEBr3Kls5iiSDfz6yWt7 oA9ztsk7ybULUiKFtVHBoTy2YRJyGQYH8j0m1ImgQTNvR16Tb5/4+6Q49GxCcbheOf5ywziMJEkcB rY3OZ8KWdthkMbqgpK/I+KbG3b0mPrNNvHyVz8TlGsRpbGfHaQRWqfCwklOJ1Qhqj90F01o+R0w/G JREiWDFA==; Received: from 089144210182.atnat0019.highway.a1.net ([89.144.210.182] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtoYc-0000KA-8p; Wed, 13 Feb 2019 07:02:10 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Olof Johansson Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/32] powerpc/pci: remove the dma_set_mask pci_controller ops methods Date: Wed, 13 Feb 2019 08:01:16 +0100 Message-Id: <20190213070133.11259-16-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213070133.11259-1-hch@lst.de> References: <20190213070133.11259-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 236a7460b6ec..98e8b46aff97 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 0d52107b90f0..5eca02315b2e 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -304,13 +304,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.20.1