aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm/dma-mapping.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-06-19 09:04:53 +0200
committerHelge Deller <deller@gmx.de>2018-08-13 09:30:13 +0200
commita34a9b9682a5a9de53386ed0872c7d38ca9d6b38 (patch)
treeb2aeaba7ec847ab4216569f1f44b0c4598ab4f0d /arch/parisc/include/asm/dma-mapping.h
parentLinux 4.18 (diff)
downloadlinux-dev-a34a9b9682a5a9de53386ed0872c7d38ca9d6b38.tar.xz
linux-dev-a34a9b9682a5a9de53386ed0872c7d38ca9d6b38.zip
parisc: merge pcx_dma_ops and pcxl_dma_ops
The only difference is that pcxl supports dma coherent allocations, while pcx only supports non-consistent allocations and otherwise fails. But dma_alloc* is not in the fast path, and merging these two allows an easy migration path to the generic dma-noncoherent implementation, so do it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to '')
-rw-r--r--arch/parisc/include/asm/dma-mapping.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h
index 01e1fc057c83..eeec8dd18e74 100644
--- a/arch/parisc/include/asm/dma-mapping.h
+++ b/arch/parisc/include/asm/dma-mapping.h
@@ -22,8 +22,7 @@
*/
#ifdef CONFIG_PA11
-extern const struct dma_map_ops pcxl_dma_ops;
-extern const struct dma_map_ops pcx_dma_ops;
+extern const struct dma_map_ops pa11_dma_ops;
#endif
extern const struct dma_map_ops *hppa_dma_ops;