From patchwork Thu Jun 8 13:26:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9774873 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 8398E60393 for ; Thu, 8 Jun 2017 13:30:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73FE928531 for ; Thu, 8 Jun 2017 13:30:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6763028548; Thu, 8 Jun 2017 13:30:12 +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 166F628531 for ; Thu, 8 Jun 2017 13:30:12 +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 1dIxUZ-0005rw-2t; Thu, 08 Jun 2017 13:28:51 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxUY-0005ql-Pi for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 13:28:50 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 91/48-03696-21159395; Thu, 08 Jun 2017 13:28:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsXiaHS5VVcw0DL SYP4RPovvWyYzOTB6HP5whSWAMYo1My8pvyKBNWP/9KCCvVwVr1sPsjcwTuPsYuTiYBE4wSZx eMdURhBHSOAEo0TDyWWsXYycHGwCKhJvnvewgyREBA6xSJx8c5QJJMEsoCDx694msCJhAX+JO d+vAsU5gEapSlzfEQMS5hUwkNi7cx8ziC0hIC+xq+0iWDknULzl9C6wMUIC+hKHFkxjBpkvId DCKNF2cQXLBEaeBYwMqxg1ilOLylKLdI2M9ZKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZL zczcxAj3PAAQ7GP/MDzzEKMnBpCTKqyhgGSnEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgveGP1BO sCg1PbUiLTMHGIIwaQkOHiUR3v8+QGne4oLE3OLMdIjUKUZFKXHeuyB9AiCJjNI8uDZY2F9il JUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMK+bL9AUnsy8Erjpr4AWMwEtXvLOAmRxSSJCSqqBUS A49FvF9K7biQf2TXz7qH7rDzb5iAt/bS5P8fmkx/3zzPPayd7KDUxZK8wFL3wL/OC+RKxq4p6 b0R4+3m16zTZGqjJflpkvUS4IahH0tPG5s3Pu15vfQzdFns3eaHmh7uQZ/uXOT7a0B/Wlplqm nsru23P+3Q7Gp5MEHpRuWzdnes9rGeM3z5VYijMSDbWYi4oTAXF4wHp2AgAA X-Env-Sender: BATV+eb06f239ea6f59aeb59b+5037+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1496928527!66741173!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 30554 invoked from network); 8 Jun 2017 13:28:49 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-4.tower-21.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2017 13:28:49 -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=Lwbn6f4QHb4uIuK5j7O2zH2GX5vKyW4uQvUxXNv1jCw=; b=NEyqKxWatZ0W16ZlxuMiUsLZP VflWTSZ5V3ene8o/qO7VQT1lD1NaX0ZizO6+zjANykgm2xrJO2rZw7xIvrG7BBQiphVE/798gLSfn ztijqe2XhobSI07W8UjkJwt3yCUspgi468BaILari6o12d1NdP4Tyq9wKlBmELsrBJUXnkoJnO3jS AYd30ZW0FyF/6J2nH52KCiZTOHozAZn5JBMTeMgVgy0hRxa3f5JGyI43Hw/VwqtrpR/HqWUvdP9wv sNGBhqfaAR+/r1ExIwJGEVMfT+CEmrsuFa8ES8nPFaixQsTHRDsIIIDxf+SIzxxj74uwlBrCp3hoI T0vVBm/NQ==; 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 1dIxUQ-000803-EX; Thu, 08 Jun 2017 13:28:43 +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:03 +0200 Message-Id: <20170608132609.32662-39-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 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 4aabf117e136..d89a0b56b245 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) @@ -474,9 +474,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,