From patchwork Fri Jun 16 18:10:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9792783 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 7A06960326 for ; Fri, 16 Jun 2017 18:15:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 747102834A for ; Fri, 16 Jun 2017 18:15:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 692EA2866B; Fri, 16 Jun 2017 18:15:17 +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=unavailable 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 E644E2834A for ; Fri, 16 Jun 2017 18:15:16 +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 1dLvkl-0002i1-Uv; Fri, 16 Jun 2017 18:13:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvkk-0002cU-1h for xen-devel@lists.xenproject.org; Fri, 16 Jun 2017 18:13:50 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 23/F7-02196-DDF14495; Fri, 16 Jun 2017 18:13:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsXiaHS5VfeOvEu kwforIhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bUzqksBfN4KybuX8XcwHiYu4uRk4NF4ASb xNaNYV2MXBxCAicYJY4uX8cIkmATUJF487yHHSQhInCIReLkm6NMIAlmAQWJX/c2sYLYwgJuE t82HGCDmKQqsX79TRYQm1fAQOLi9pnsILaEgLzErraLYPWcQPGfR7aBLRAS0JeYcvMuI8gCCY EWRom2iytYJjDyLGBkWMWoUZxaVJZapGtopJdUlJmeUZKbmJmja2hgrJebWlycmJ6ak5hUrJe cn7uJEeh7BiDYwfiq2/kQoyQHk5Io7/snzpFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHgny7lE CgkWpaanVqRl5gCDECYtwcGjJMK7nw8ozVtckJhbnJkOkTrFqCglzrsVpE8AJJFRmgfXBgv8S 4yyUsK8jECHCPEUpBblZpagyr9iFOdgVBLmfQoyhSczrwRu+iugxUxAi4MuOIAsLklESEk1MB bck3XIWHDnhEbqnbyesmquEGP5U9PkL1TXH9ghuppH9aWus9Y3xfAp85foWKTUxP45fpe9UZC Bx15snmniNiGTzKbTTwz2H90Vw9Oi/3iO1iLVlC1L7vPOjGYsdsxS0XumYOGfZ9nCYHs92uHh zbcLj/xbd7S6gUGv1dfrjfyq8147rNg7lFiKMxINtZiLihMBk3Yut3cCAAA= X-Env-Sender: BATV+48ca1ab4adaecdf09dc3+5045+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1497636826!94345552!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 65074 invoked from network); 16 Jun 2017 18:13:48 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-2.tower-31.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 16 Jun 2017 18:13:48 -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=JZoNONjpQ2Ds2v9rfZzYVfYuO +z6UHFCnaQMmtWOC0qXuglDEcIpuDvYO2PoRcJUQfw2YwoncyaP3UdtJRHliGSe6q0dnBoyJlVnQf p/K9Eb5i+H8ePY2+REFkworj2km4DW2FKAzU7aYS3+NEL2wJeRJZOVn/PsIOJVqIkJUdN8R7ua+T3 D0ytt191cZxz5rpJmuuy7ZUoG3aLZ+fGyhUL8LvmPdQpR0ivDcml9qNKvWZ2TKUbKQqp0Dm0flxiN yTqyRzDqZg+UPGvn5POkplGvzsWdAtaX1RiD8nskOY8nyWbiXE7srYD5ImHpoBhxXw1Lq6ldYKChP GLHaKb6Fw==; 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 1dLvkc-0007Mv-Ii; Fri, 16 Jun 2017 18:13: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: Fri, 16 Jun 2017 20:10:59 +0200 Message-Id: <20170616181059.19206-45-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 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);