From patchwork Fri Jun 16 18:10:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9792749 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 9056F60326 for ; Fri, 16 Jun 2017 18:14:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BE8B2625B for ; Fri, 16 Jun 2017 18:14:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 808462866B; Fri, 16 Jun 2017 18:14:52 +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 0E10A2625B for ; Fri, 16 Jun 2017 18:14:52 +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 1dLvkS-00020e-Cz; Fri, 16 Jun 2017 18:13:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvkQ-0001ws-Nm for xen-devel@lists.xenproject.org; Fri, 16 Jun 2017 18:13:30 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id B7/27-03613-ACF14495; Fri, 16 Jun 2017 18:13:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsXiaHS5VfekvEu kwaazPBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8biD4fZC/ZyVbR33mZuYJzG2cXIxcEicIJN YvaCr2wgjpDACUaJfXMnMHUxcnKwCahIvHneww6SEBE4xCJx8s1RsASzgILEr3ubWEFsYQF/i Tnfr4LFWQRUJc72rgOL8woYSCxYOIcFxJYQkJfY1XYRLM4JFP95ZBsjiC0koC8x5eZdRpAFEg ItjBJtF1ewTGDkWcDIsIpRvTi1qCy1SNdSL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk /dxMj0PcMQLCD8e6mgEOMkhxMSqK87584RwrxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4J0s5xIp JFiUmp5akZaZAwxCmLQEB4+SCO9+PqA0b3FBYm5xZjpE6hSjopQ471aQPgGQREZpHlwbLPAvM cpKCfMyAh0ixFOQWpSbWYIq/4pRnINRSZj3KcgUnsy8Erjpr4AWMwEtDrrgALK4JBEhJdXAyP nqV2jthMOF8UdDbG9r38tx8Dt1TO7D4QXnLtczW+1wNjC6r6YZ8FS3d9MF32fae8rkwpM+ta3 Xb3kma78mq2wmS/3hG2qSZ8y2Tek8+jhn3f4jBXO/fr+t77PMKObx+5gvnYfmR3ZdFLB5waA0 7bLWx8UPToapHPh5m+F/VNm99OfNBye7VSmxFGckGmoxFxUnAgBx9cNKdwIAAA== X-Env-Sender: BATV+48ca1ab4adaecdf09dc3+5045+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1497636807!102590770!1 X-Originating-IP: [65.50.211.133] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63797 invoked from network); 16 Jun 2017 18:13:29 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-5.tower-27.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 16 Jun 2017 18:13:29 -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=E0zgYZLX6gDb+kYRhTS0MocvUIJAc2rXyR9KKyFs6H0=; b=qdp9a3ZPzfh6mYmgfhXItwjRT Wmrap00CPMJd5bD9s11mFcjr8Uw565FOG1dEpjA5IEbg/kbpnalSyj7u2NdcEgFPVMeSUKM9dDHpA moy7Jp7hEbqaU6JRu/9aF3ic/qZ8KL9rBFRPylmmulOf7ogjNqPk3XwdPCyNdy3GFfMPfG69931Lq B1jsDKR899HmTUjrQtM3E4/R4IyWCAbGq1m1TewOV5EZhD0FN/vd1EWaxvTwGQVje4D4FetG/jb6S 6wleOvD8deUuPXltqr03AuzdFaDLTHRI+KIy5pKxSIzl5zmJed9YEiBoFetrl3/JhRc+RGMQt4gYv Bo/+ytMhg==; 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 1dLvkJ-0006wp-Sp; Fri, 16 Jun 2017 18:13:24 +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: Fri, 16 Jun 2017 20:10:53 +0200 Message-Id: <20170616181059.19206-39-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170616181059.19206-1-hch@lst.de> References: <20170616181059.19206-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 38/44] arm: implement ->dma_supported instead of ->set_dma_mask 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 Same behavior, less code duplication. Signed-off-by: Christoph Hellwig --- arch/arm/common/dmabounce.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 6ecd5be5d37e..9a92de63426f 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c @@ -445,12 +445,12 @@ static void dmabounce_sync_for_device(struct device *dev, arm_dma_ops.sync_single_for_device(dev, handle, size, dir); } -static int dmabounce_set_mask(struct device *dev, u64 dma_mask) +static int dmabounce_dma_supported(struct device *dev, u64 dma_mask) { if (dev->archdata.dmabounce) return 0; - return arm_dma_ops.set_dma_mask(dev, dma_mask); + return arm_dma_ops.dma_supported(dev, dma_mask); } static int dmabounce_mapping_error(struct device *dev, dma_addr_t dma_addr) @@ -471,9 +471,8 @@ static const struct dma_map_ops dmabounce_ops = { .unmap_sg = arm_dma_unmap_sg, .sync_sg_for_cpu = arm_dma_sync_sg_for_cpu, .sync_sg_for_device = arm_dma_sync_sg_for_device, - .set_dma_mask = dmabounce_set_mask, + .dma_supported = dmabounce_dma_supported, .mapping_error = dmabounce_mapping_error, - .dma_supported = arm_dma_supported, }; static int dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev,