From patchwork Fri Aug 25 15:50:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 111030 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1209661qge; Fri, 25 Aug 2017 08:51:34 -0700 (PDT) X-Received: by 10.80.132.164 with SMTP id 33mr9597499edq.163.1503676293860; Fri, 25 Aug 2017 08:51:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503676293; cv=none; d=google.com; s=arc-20160816; b=gKgV0I3FqRlJsPcMNhhTMEJRefiWWVrNjdvmbLCJonB1uH+WwIliETXdt2kTNP2lE3 5JqWMnNkq6U2GpoRXlpOUTNgGNyIMI8ang2PNLfMioflLdm03ODfP31+R7/AD1CCHsPX iPwAu58fAA7cKy+nDzs3B8ouaAI3pSZmuGdA1qstZPWANFaitPlk2AIeeoI95eZlIijf vkwxH+OkD6jaKyLM59Wl93AoXZmc/qzJ061YovOYFdy7rnKwSH/zb4IaVEj7MOKDIpUE 6oExE1pQBA9wo/nm9z3QOO7hFsFz9pBVr5ig2GflkN6Ev82ZsfgfckanVeEI3XJoZtaa jjCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=bTymR2VrXDDIwTb7Nfv+pWTi9/zInMakqSeJwrRJE6o=; b=nfRP3aMP+6rftAWYFbiubCh5oua4Eycjr8DdT4nI1ycY2kf+Hlvygce93ltVfL/86v LMDJNvo8NNgxI62E9pVzOTYMxCvsdqlOU+SXo21CE08qux/ui/ti2Mls5rq/FLT4UJIt EjGB0Svsamc6pA4daIGEwetJoW/WfeC9CQRzZx4sR2vNAwi1TAhGOBbi/5ZulsKPjDwe k8b2Ul1RQPf1iDF/omlIOCEPmPIj2+ArdqsK2Tof185x4ANtisZ0cg91cDoar1noIceF X7of+EWX+2a8rF6KmacZGhpG0qRyCZixe7P0aKrjDrxTRTeTlIhw3CLlvOpkduE6TJ6Q 93Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=Yj8nlcuF; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id l49si6169608edc.246.2017.08.25.08.51.33; Fri, 25 Aug 2017 08:51:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=Yj8nlcuF; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 19682C21F67; Fri, 25 Aug 2017 15:51:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2C9B1C21EEC; Fri, 25 Aug 2017 15:51:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4236DC21EEC; Fri, 25 Aug 2017 15:51:20 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 81FBCC21C73 for ; Fri, 25 Aug 2017 15:51:18 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-10.nifty.com with ESMTP id v7PFoNwd025245; Sat, 26 Aug 2017 00:50:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v7PFoNwd025245 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1503676224; bh=dVIpB+doFmmQKRWMMTYhfQIHFIdLDRdEaSITGnIArsI=; h=From:To:Cc:Subject:Date:From; b=Yj8nlcuFRoPP2C454VrbTA/JQlErbY12slkI0IR2I0fRUNdQRER749yIBeyFtDGDx GYso+ZCyctCbeg0wD+oX1bGd6kY10EYnnXCdYibcVu4hT4t2u0msST4dTBNEdi14MD KR3ZDajMcRnVNngXad7IhmPFqsN1rB1qM/VFUsT8YcwKrEBpt1Z4ckkzmWivkLX87B xQ1yOep7yavJsW7PbgXCKyxUCFBvDhAPpmBMNz4SyGMtT4nAzCUzSlvZ/wfaCVFlrb PsL9JCrzy0rEJ3byBOilO76xqGWYIZAS4rbeaiLPFgb+kUY1iVbJJcnx/00c5vMUAs DThbtJuR+tuow== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 26 Aug 2017 00:50:17 +0900 Message-Id: <1503676217-27262-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Albert Aribaud , Andy Shevchenko , Macpaul Lin Subject: [U-Boot] [PATCH] dma: import linux/dma-direction.h to consolidate enum dma_data_direction X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Import include/linux/dma-direction.h from Linux 4.13-rc7 and delete duplicated definitions of enum dma_data_direction. Signed-off-by: Masahiro Yamada Reviewed-by: Andy Shevchenko --- arch/arm/include/asm/dma-mapping.h | 8 ++------ arch/nds32/include/asm/dma-mapping.h | 6 +----- arch/x86/include/asm/dma-mapping.h | 8 ++------ drivers/ata/sata_dwc.c | 1 + drivers/ata/sata_dwc.h | 7 ------- drivers/mmc/uniphier-sd.c | 2 +- include/linux/dma-direction.h | 13 +++++++++++++ 7 files changed, 20 insertions(+), 25 deletions(-) create mode 100644 include/linux/dma-direction.h diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index a5821f54e567..287466800e4b 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -8,13 +8,9 @@ #ifndef __ASM_ARM_DMA_MAPPING_H #define __ASM_ARM_DMA_MAPPING_H -#define dma_mapping_error(x, y) 0 +#include -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, -}; +#define dma_mapping_error(x, y) 0 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) { diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h index 25e5a1b6ec8a..a627306ed852 100644 --- a/arch/nds32/include/asm/dma-mapping.h +++ b/arch/nds32/include/asm/dma-mapping.h @@ -7,11 +7,7 @@ #ifndef __ASM_NDS_DMA_MAPPING_H #define __ASM_NDS_DMA_MAPPING_H -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, -}; +#include static void *dma_alloc_coherent(size_t len, unsigned long *handle) { diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 7de4c08e36ea..43073ad2524f 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -8,13 +8,9 @@ #ifndef __ASM_X86_DMA_MAPPING_H #define __ASM_X86_DMA_MAPPING_H -#define dma_mapping_error(x, y) 0 +#include -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, -}; +#define dma_mapping_error(x, y) 0 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) { diff --git a/drivers/ata/sata_dwc.c b/drivers/ata/sata_dwc.c index a226ca2decb5..2f3b2ddb411f 100644 --- a/drivers/ata/sata_dwc.c +++ b/drivers/ata/sata_dwc.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/ata/sata_dwc.h b/drivers/ata/sata_dwc.h index e2d9e0c1fce8..17fb20cf437b 100644 --- a/drivers/ata/sata_dwc.h +++ b/drivers/ata/sata_dwc.h @@ -401,13 +401,6 @@ struct ata_device { #endif }; -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, - DMA_NONE = 3, -}; - struct ata_link { struct ata_port *ap; int pmp; diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index e272b1415324..721b75fddace 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -11,10 +11,10 @@ #include #include #include +#include #include #include #include -#include DECLARE_GLOBAL_DATA_PTR; diff --git a/include/linux/dma-direction.h b/include/linux/dma-direction.h new file mode 100644 index 000000000000..95b6a82f5951 --- /dev/null +++ b/include/linux/dma-direction.h @@ -0,0 +1,13 @@ +#ifndef _LINUX_DMA_DIRECTION_H +#define _LINUX_DMA_DIRECTION_H +/* + * These definitions mirror those in pci.h, so they can be used + * interchangeably with their PCI_ counterparts. + */ +enum dma_data_direction { + DMA_BIDIRECTIONAL = 0, + DMA_TO_DEVICE = 1, + DMA_FROM_DEVICE = 2, + DMA_NONE = 3, +}; +#endif