Skip to contentSkip to conversation

dma: import linux/dma-direction.h to consolidate enum dma_data_direction

PATCH In review Masahiro Yamada 3 participants 3 messages Aug 25, 2017 – Sep 13, 2017

Subsystems (5)
Arm (32-bit) x86 MMC, SD and SDIO libata +1 more subsystems
lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/1 dma: import linux/dma-direction.h to consolidate enum dma_data_direction

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 <[email protected]>

---

 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
arch/arm/include/asm/dma-mapping.h +2 -6
index a5821f54e567..287466800e4b 100644
@@ -8,13 +8,9 @@
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
-#define	dma_mapping_error(x, y)	0
+#include <linux/dma-direction.h>
 
-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)
 {
arch/nds32/include/asm/dma-mapping.h +1 -5
index 25e5a1b6ec8a..a627306ed852 100644
@@ -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 <linux/dma-direction.h>
 
 static void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
arch/x86/include/asm/dma-mapping.h +2 -6
index 7de4c08e36ea..43073ad2524f 100644
@@ -8,13 +8,9 @@
 #ifndef __ASM_X86_DMA_MAPPING_H
 #define __ASM_X86_DMA_MAPPING_H
 
-#define	dma_mapping_error(x, y)	0
+#include <linux/dma-direction.h>
 
-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)
 {
drivers/ata/sata_dwc.c +1 -0
index a226ca2decb5..2f3b2ddb411f 100644
@@ -26,6 +26,7 @@
 #include <command.h>
 #include <pci.h>
 #include <asm/processor.h>
+#include <linux/dma-direction.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <malloc.h>
drivers/ata/sata_dwc.h +0 -7
index e2d9e0c1fce8..17fb20cf437b 100644
@@ -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;
drivers/mmc/uniphier-sd.c +1 -1
index e272b1415324..721b75fddace 100644
@@ -11,10 +11,10 @@
 #include <mmc.h>
 #include <dm.h>
 #include <linux/compat.h>
+#include <linux/dma-direction.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <asm/unaligned.h>
-#include <asm/dma-mapping.h>
 
 DECLARE_GLOBAL_DATA_PTR;
include/linux/dma-direction.h new file +13 -0
new file mode 100644
index 000000000000..95b6a82f5951
@@ -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
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 dma: import linux/dma-direction.h to consolidate enum dma_data_direction

Quoted 3 lines · Masahiro Yamada

Import include/linux/dma-direction.h from Linux 4.13-rc7 and delete duplicated definitions of enum dma_data_direction.

Makes sense.

Reviewed-by Andy Shevchenko <[email protected]>
Quoted 141 lines
Signed-off-by Masahiro Yamada <[email protected]>

---

 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

arch/arm/include/asm/dma-mapping.h +0 -0
index a5821f54e567..287466800e4b 100644
@@ -8,13 +8,9 @@
  #ifndef __ASM_ARM_DMA_MAPPING_H
  #define __ASM_ARM_DMA_MAPPING_H

arch/arm/include/asm/dma-mapping.h +1 -1
-#define	dma_mapping_error(x, y)	0
+#include <linux/dma-direction.h>

arch/arm/include/asm/dma-mapping.h +1 -5
-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)
 {

arch/nds32/include/asm/dma-mapping.h +0 -0
index 25e5a1b6ec8a..a627306ed852 100644
@@ -7,11 +7,7 @@
  #ifndef __ASM_NDS_DMA_MAPPING_H
  #define __ASM_NDS_DMA_MAPPING_H

arch/nds32/include/asm/dma-mapping.h +1 -5
-enum dma_data_direction {
-	DMA_BIDIRECTIONAL	= 0,
-	DMA_TO_DEVICE		= 1,
-	DMA_FROM_DEVICE		= 2,
-};
+#include <linux/dma-direction.h>


 static void *dma_alloc_coherent(size_t len, unsigned long *handle) {

arch/x86/include/asm/dma-mapping.h +0 -0
index 7de4c08e36ea..43073ad2524f 100644
@@ -8,13 +8,9 @@
  #ifndef __ASM_X86_DMA_MAPPING_H
  #define __ASM_X86_DMA_MAPPING_H

arch/x86/include/asm/dma-mapping.h +1 -1
-#define	dma_mapping_error(x, y)	0
+#include <linux/dma-direction.h>

arch/x86/include/asm/dma-mapping.h +1 -5
-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)
 {

drivers/ata/sata_dwc.c +1 -0
index a226ca2decb5..2f3b2ddb411f 100644
@@ -26,6 +26,7 @@
  #include <command.h>
  #include <pci.h>
  #include <asm/processor.h>
+#include <linux/dma-direction.h>
  #include <linux/errno.h>
  #include <asm/io.h>
  #include <malloc.h>
drivers/ata/sata_dwc.h +0 -0
index e2d9e0c1fce8..17fb20cf437b 100644
@@ -401,13 +401,6 @@ struct ata_device {
  #endif
  };

drivers/ata/sata_dwc.h +0 -7
-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;

drivers/mmc/uniphier-sd.c +1 -1
index e272b1415324..721b75fddace 100644
@@ -11,10 +11,10 @@
  #include <mmc.h>
  #include <dm.h>
  #include <linux/compat.h>
+#include <linux/dma-direction.h>
  #include <linux/io.h>
  #include <linux/sizes.h>
  #include <asm/unaligned.h>
-#include <asm/dma-mapping.h>


 DECLARE_GLOBAL_DATA_PTR;

include/linux/dma- renamed from include/linux/dma-direction.h +0 -0

direction.h
new file mode 100644
index 000000000000..95b6a82f5951

include/linux/dma-direction.h new file +13 -0
@@ -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
Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#2 lore raw
In reply to Masahiro Yamada
Quoted 5 lines · Masahiro Yamada

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 <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170912/42b5c779/attachment.sig>