From patchwork Thu Jun 8 13:26:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9774901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3D09060393 for ; Thu, 8 Jun 2017 13:30:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F5A228543 for ; Thu, 8 Jun 2017 13:30:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2412928556; Thu, 8 Jun 2017 13:30:27 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CAA2628543 for ; Thu, 8 Jun 2017 13:30:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxUs-0006QR-Eb; Thu, 08 Jun 2017 13:29:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxUr-0006O0-5V for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 13:29:09 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 84/87-01752-42159395; Thu, 08 Jun 2017 13:29:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsXiaHS5VVcp0DL SoGWbmsX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnF79TO2gg88FceOz2drYJzO3cXIxcEicIJN YuH506wgjpDACUaJnTd72boYOTnYBFQk3jzvYQdJiAgcYpE4+eYoE0iCWUBB4te9TawgtrCAk 0Tz1qNARRxAo1QlHh4oAgnzChhIrDo6hxHElhCQl9jVdhGsnBMo3nJ6F9gYIQF9iUMLpjGDzJ cQaGGUaLu4gmUCI88CRoZVjBrFqUVlqUW6hsZ6SUWZ6RkluYmZObqGBqZ6uanFxYnpqTmJScV 6yfm5mxiBvmcAgh2M/7Z5HmKU5GBSEuVVFLCMFOJLyk+pzEgszogvKs1JLT7EKMPBoSTB6xQA lBMsSk1PrUjLzAEGIUxagoNHSYT3vw9Qmre4IDG3ODMdInWKUVFKnPeuP1BCACSRUZoH1wYL/ EuMslLCvIxAhwjxFKQW5WaWoMq/YhTnYFQS5nXzBZrCk5lXAjf9FdBiJqDFS95ZgCwuSURIST UwZigL2k44Y+C29bag8Z3tLyM/XiydenfZMa56D08BOdvfCzpfqxT+V9lv8MqQ3ctpro3R20n 76w+vC9CcyiG51f7dP8OTDMcjBY25Ty790icRyenLlahx8l6K7Vo2wacrxH6LiCuuulZWsEfH 4vbEGrP/sZltb+b83VfzYZbZHlPFSVHXym6uVWIpzkg01GIuKk4EANo3UPd3AgAA X-Env-Sender: BATV+eb06f239ea6f59aeb59b+5037+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-3.tower-206.messagelabs.com!1496928544!98885440!1 X-Originating-IP: [65.50.211.133] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34816 invoked from network); 8 Jun 2017 13:29:06 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-3.tower-206.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2017 13:29:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding: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=lR6x5uNOAP+GhigMbCiwoL6Qu+Q3Ix9NaMyJN6X36xY=; b=Bp4wvkSUoBkEVJnaTmLNhwuJN QvujLDSmIY3yOqX8AMB7yRmzqUtDkjHCfVI2dOjHt8B4+vJ9Eraw8YKesZWl1UHJNlQzm6gJeD+SU 17FhyNCJb7UbLKlC1qJunT5JuajyIkkozgmJsvFPtt+kQGNNEOlPkyjKcrpjnmm/0/1nnctXRcKQD o+B94peH/TPSHFEhOAB/HVtNwD0IAR5KACgfMN/jwz82mr37jumWKtYHSoj/NgwJ5c6p10ugb2RYR pgz5VnBFW0ydeGchwZ7CyEDsiJHzb2w9my/2LsY3yvxCNkvsObsBFbO+DiY8DdC4IML3Wna1WOo6c wTccIFFFQ==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dIxUj-0008PI-Dp; Thu, 08 Jun 2017 13:29:02 +0000 From: Christoph Hellwig To: x86@kernel.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, openrisc@lists.librecores.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, iommu@lists.linux-foundation.org, netdev@vger.kernel.org Date: Thu, 8 Jun 2017 15:26:08 +0200 Message-Id: <20170608132609.32662-44-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608132609.32662-1-hch@lst.de> References: <20170608132609.32662-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Cc: linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH 43/44] dma-mapping: remove the set_dma_mask method X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig --- arch/powerpc/kernel/dma.c | 4 ---- include/linux/dma-mapping.h | 6 ------ 2 files changed, 10 deletions(-) diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 41c749586bd2..466c9f07b288 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -316,10 +316,6 @@ EXPORT_SYMBOL(dma_set_coherent_mask); int __dma_set_mask(struct device *dev, u64 dma_mask) { - const struct dma_map_ops *dma_ops = get_dma_ops(dev); - - if ((dma_ops != NULL) && (dma_ops->set_dma_mask != NULL)) - return dma_ops->set_dma_mask(dev, dma_mask); if (!dev->dma_mask || !dma_supported(dev, dma_mask)) return -EIO; *dev->dma_mask = dma_mask; diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 3e5908656226..527f2ed8c645 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -127,7 +127,6 @@ struct dma_map_ops { enum dma_data_direction dir); int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); int (*dma_supported)(struct device *dev, u64 mask); - int (*set_dma_mask)(struct device *dev, u64 mask); #ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK u64 (*get_required_mask)(struct device *dev); #endif @@ -563,11 +562,6 @@ static inline int dma_supported(struct device *dev, u64 mask) #ifndef HAVE_ARCH_DMA_SET_MASK static inline int dma_set_mask(struct device *dev, u64 mask) { - const struct dma_map_ops *ops = get_dma_ops(dev); - - if (ops->set_dma_mask) - return ops->set_dma_mask(dev, mask); - if (!dev->dma_mask || !dma_supported(dev, mask)) return -EIO; *dev->dma_mask = mask;