Skip to contentSkip to conversation

powerpc: use <asm-generic/dma-mapping.h>

PATCH Applied Christoph Hellwig 2 participants 3 messages Aug 7, 2019 – Nov 14, 2019 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: use <asm-generic/dma-mapping.h>

The powerpc version of dma-mapping.h only contains a version of get_arch_dma_ops that always return NULL. Replace it with the asm-generic version that does the same.

---
 arch/powerpc/include/asm/Kbuild        |  1 +
 arch/powerpc/include/asm/dma-mapping.h | 18 ------------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 arch/powerpc/include/asm/dma-mapping.h
arch/powerpc/include/asm/Kbuild +1 -0
index 9a1d2fc6ceb7..15bb09ad5dc2 100644
@@ -4,6 +4,7 @@ generated-y += syscall_table_64.h
 generated-y += syscall_table_c32.h
 generated-y += syscall_table_spu.h
 generic-y += div64.h
+generic-y += dma-mapping.h
 generic-y += export.h
 generic-y += irq_regs.h
 generic-y += local64.h
arch/powerpc/include/asm/dma-mapping.h deleted +0 -18
deleted file mode 100644
index 565d6f74b189..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2004 IBM
- */
-#ifndef _ASM_DMA_MAPPING_H
-#define _ASM_DMA_MAPPING_H
-
-static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
-{
-	/* We don't handle the NULL dev case for ISA for now. We could
-	 * do it via an out of line call but it is not needed for now. The
-	 * only ISA DMA device we support is the floppy and we have a hack
-	 * in the floppy driver directly to get a device for us.
-	 */
-	return NULL;
-}
-
-#endif	/* _ASM_DMA_MAPPING_H */
Signature · 1 line
2.20.1
#1 lore raw

ping?

Quoted 49 lines · Christoph Hellwig

The powerpc version of dma-mapping.h only contains a version of get_arch_dma_ops that always return NULL. Replace it with the asm-generic version that does the same.

---
 arch/powerpc/include/asm/Kbuild        |  1 +
 arch/powerpc/include/asm/dma-mapping.h | 18 ------------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 arch/powerpc/include/asm/dma-mapping.h
arch/powerpc/include/asm/Kbuild +1 -0
index 9a1d2fc6ceb7..15bb09ad5dc2 100644
@@ -4,6 +4,7 @@ generated-y += syscall_table_64.h
 generated-y += syscall_table_c32.h
 generated-y += syscall_table_spu.h
 generic-y += div64.h
+generic-y += dma-mapping.h
 generic-y += export.h
 generic-y += irq_regs.h
 generic-y += local64.h
arch/powerpc/include/asm/dma-mapping.h deleted +0 -18
deleted file mode 100644
index 565d6f74b189..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2004 IBM
- */
-#ifndef _ASM_DMA_MAPPING_H
-#define _ASM_DMA_MAPPING_H
-
-static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
-{
-	/* We don't handle the NULL dev case for ISA for now. We could
-	 * do it via an out of line call but it is not needed for now. The
-	 * only ISA DMA device we support is the floppy and we have a hack
-	 * in the floppy driver directly to get a device for us.
-	 */
-	return NULL;
-}
-
-#endif	/* _ASM_DMA_MAPPING_H */
Signature · 1 line
2.20.1

---end quoted text---