From patchwork Thu Jun 8 13:25:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9774783 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 D301260393 for ; Thu, 8 Jun 2017 13:28:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4C712850E for ; Thu, 8 Jun 2017 13:28:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9A1828531; Thu, 8 Jun 2017 13:28:57 +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 6ED842850E for ; Thu, 8 Jun 2017 13:28:57 +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 1dIxTF-0003oB-6u; Thu, 08 Jun 2017 13:27:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxTE-0003n7-K4 for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 13:27:28 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id DF/DA-02955-FB059395; Thu, 08 Jun 2017 13:27:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsXiaHS5VXd/gGW kwdwJkhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0ZL40m2gv/cFeumf2JrYFzN1cXIxcEicIJN 4s+EQ0xdjJwcQgInGCWurfcBsdkEVCTePO9hBykSETjEInHyzVGwImYBBYlf9zaxgtjCAsYS7 U8Pg9ksAqoSF2e2s4PYvAIGEg+nv2QGsSUE5CV2tV0Eq+EEirec3gW1TF/i0IJpzCALJARaGC XaLq5gmcDIs4CRYRWjRnFqUVlqka6hkV5SUWZ6RkluYmaOrqGBsV5uanFxYnpqTmJSsV5yfu4 mRqDvGYBgB+OrbudDjJIcTEqivIoClpFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHgT/IFygkWp 6akVaZk5wCCESUtw8CiJ8P73AUrzFhck5hZnpkOkTjEqSonzFoD0CYAkMkrz4NpggX+JUVZKm JcR6BAhnoLUotzMElT5V4ziHIxKwrxuvkBTeDLzSuCmvwJazAS0eMk7C5DFJYkIKakGRqbwLa Yn4rRLZPZ6rFkyI2lplOmqpcEM1VGT7fssfpvH79m0Y9HD5JM7EqYYzNjDwSPfZrj+3NPyAFE n6fBHNyQiXeyVV0+SVNv4sub7ls5jNfyLVBp+RVVdd2KaHWRoHSY26egi+02Tmf91NxlVPqmM kWDeGaat/CuEd0bWSuYnK6Xe/E9eqcRSnJFoqMVcVJwIAPR76Ht3AgAA X-Env-Sender: BATV+eb06f239ea6f59aeb59b+5037+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-9.tower-31.messagelabs.com!1496928445!49225486!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 19852 invoked from network); 8 Jun 2017 13:27:27 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-9.tower-31.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2017 13:27:27 -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=rRlEkq7ccpCu+4ZT4QJ/0G+bz+IYGZZVEmqRXUa5850=; b=EvItnHTNRb8NcG3yORyv5/V/y nD3RPNrfoxHXm3gij0+IQJmPupa+/vtC03LBMf0IopMJSbd3x/I7dhgvWnsNObzYIOOCkBe3dDdbM TxsDsrhRwVnewdjC4UGUjRBOWM4eGvI2L7KNx8V5wiSYqNtwR3onJaHBtjIQaYk9t6DyUsWbtq7kk MseTWDOuNlLz7E/eRaGYbywwpf4v8wNPbYVh+ovVBlbHJJ/JnxokW0tbnL+eGQ4c7k021/a9W3jOY qARqK1EQyIag53t6wxOKPhNKOyjk6GT53tWYmvbgMKK6rCLMx5CegBgInJMUuW6ZF4l03VoUw9nQm dtHjrgeQA==; 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 1dIxT6-00069Y-76; Thu, 08 Jun 2017 13:27:21 +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:25:41 +0200 Message-Id: <20170608132609.32662-17-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 16/44] arm64: remove DMA_ERROR_CODE 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 The dma alloc interface returns an error by return NULL, and the mapping interfaces rely on the mapping_error method, which the dummy ops already implement correctly. Thus remove the DMA_ERROR_CODE define. Signed-off-by: Christoph Hellwig Reviewed-by: Robin Murphy --- arch/arm64/include/asm/dma-mapping.h | 1 - arch/arm64/mm/dma-mapping.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index 5392dbeffa45..cf8fc8f05580 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -24,7 +24,6 @@ #include #include -#define DMA_ERROR_CODE (~(dma_addr_t)0) extern const struct dma_map_ops dummy_dma_ops; static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 3216e098c058..147fbb907a2f 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -184,7 +184,6 @@ static void *__dma_alloc(struct device *dev, size_t size, no_map: __dma_free_coherent(dev, size, ptr, *dma_handle, attrs); no_mem: - *dma_handle = DMA_ERROR_CODE; return NULL; } @@ -487,7 +486,7 @@ static dma_addr_t __dummy_map_page(struct device *dev, struct page *page, enum dma_data_direction dir, unsigned long attrs) { - return DMA_ERROR_CODE; + return 0; } static void __dummy_unmap_page(struct device *dev, dma_addr_t dev_addr,