From patchwork Thu Jun 8 13:26:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9774899 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 0AA3B603B4 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 F0FE828548 for ; Thu, 8 Jun 2017 13:30:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E59E128553; Thu, 8 Jun 2017 13:30:26 +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 90C9928556 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 1dIxUu-0006Ug-Nb; Thu, 08 Jun 2017 13:29:12 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxUt-0006SL-QA for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 13:29:11 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id C2/1B-03620-72159395; Thu, 08 Jun 2017 13:29:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsXiaHS5VVc10DL SYMJXc4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNWNq51SWgnm8FRP3r2JuYDzM3cXIxcEicIJN 4lvzLRYQR0jgBKPEmUnzmLsYOTnYBFQk3jzvYQdJiAgcYpE4+eYoE0iCWUBB4te9TawgtrCAm 8S3DQfYQGwWAVWJqW/XM4LYvAIGEpeuTmUBsSUE5CV2tV0Eq+cEirec3gU2R0hAX+LQgmnMIA skBFoYJdourmCZwMizgJFhFaN6cWpRWWqRrrleUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrF ecn7uJkag7xmAYAfjzMv+hxglOZiURHkVBSwjhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw3vAH ygkWpaanVqRl5gCDECYtwcGjJML73wcozVtckJhbnJkOkTrFqCglznsXpE8AJJFRmgfXBgv8S 4yyUsK8jECHCPEUpBblZpagyr9iFOdgVBLmdfMFmsKTmVcCN/0V0GImoMVL3lmALC5JREhJNT AaBMkIHHP50GFokbbXfM1D5otqG4uOveDfYRd6e+LOFK55/E+LlyU76jQtate7wTXjq0jMZdf WoFVMe1dsnr6mXaBuYYVBzhH7JX3Fk6p0BGZveyRdnsM2ySU422rn7N3vJQ7yrW55p76pZF91 6jxFzY/J0ZdMXUylpnhnbXX0mupS5MJwIUyJpTgj0VCLuag4EQBo8RRhdwIAAA== X-Env-Sender: BATV+eb06f239ea6f59aeb59b+5037+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1496928548!49884530!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 474 invoked from network); 8 Jun 2017 13:29:09 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-6.tower-21.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2017 13:29:09 -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=eZHE6yUSAfMLSefbu18rbdpTGXQMlt8s3PB24r4P6cc=; b=aJQadZcfi9maJfgN3Qgswnfgh f3csN/DQJrNd/PMgOamZY7jhCH7zyI/K27fC02ckR7H/ArI4cyn6YVtP3lN45NlS57RNZaup8Ixka PInxfM5hgOaUuMEuFE9o+iDu8SKaPFa6QOyqA2OYhHjUbvHYpB06GI9QncFVmdx8V/cgNu6cltxuV 9eGX2LWskbAFUSuhJyTOHNeaVpvYG4ULQHExCQjnoU0zLAsmcE0oobIcqU2cfArvF4SU8hKYb2CW2 0I9E+pNgzSQ4DSP0A4GgDrKzpWNjG1VcaI6yKgKw74d1BxhZ6GZIoNkTId3/rav/CPjLwEV8YJuSF zURRo4oHA==; 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 1dIxUm-0008TZ-On; Thu, 08 Jun 2017 13:29:05 +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:09 +0200 Message-Id: <20170608132609.32662-45-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 44/44] powerpc: merge __dma_set_mask into dma_set_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 Signed-off-by: Christoph Hellwig --- arch/powerpc/include/asm/dma-mapping.h | 1 - arch/powerpc/kernel/dma.c | 13 ++++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h index 73aedbe6c977..eaece3d3e225 100644 --- a/arch/powerpc/include/asm/dma-mapping.h +++ b/arch/powerpc/include/asm/dma-mapping.h @@ -112,7 +112,6 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off) #define HAVE_ARCH_DMA_SET_MASK 1 extern int dma_set_mask(struct device *dev, u64 dma_mask); -extern int __dma_set_mask(struct device *dev, u64 dma_mask); extern u64 __dma_get_required_mask(struct device *dev); static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 466c9f07b288..4194bbbbdb10 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -314,14 +314,6 @@ EXPORT_SYMBOL(dma_set_coherent_mask); #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) -int __dma_set_mask(struct device *dev, u64 dma_mask) -{ - if (!dev->dma_mask || !dma_supported(dev, dma_mask)) - return -EIO; - *dev->dma_mask = dma_mask; - return 0; -} - int dma_set_mask(struct device *dev, u64 dma_mask) { if (ppc_md.dma_set_mask) @@ -334,7 +326,10 @@ int dma_set_mask(struct device *dev, u64 dma_mask) return phb->controller_ops.dma_set_mask(pdev, dma_mask); } - return __dma_set_mask(dev, dma_mask); + if (!dev->dma_mask || !dma_supported(dev, dma_mask)) + return -EIO; + *dev->dma_mask = dma_mask; + return 0; } EXPORT_SYMBOL(dma_set_mask);