summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-02-21 12:24:02 -0800
committerChristoph Hellwig <hch@lst.de>2020-03-16 10:48:02 +0100
commit4f8232bbf887123f78bcdca3dfd2b3dfa52a0112 (patch)
treeec534d3d2c43b28cf92423e28abc9fa750416384 /arch/xtensa
parent286c21de32b904131f8cf6a36ce40b8b0c9c5da3 (diff)
downloadlinux-stable-4f8232bbf887123f78bcdca3dfd2b3dfa52a0112.tar.gz
linux-stable-4f8232bbf887123f78bcdca3dfd2b3dfa52a0112.tar.bz2
linux-stable-4f8232bbf887123f78bcdca3dfd2b3dfa52a0112.zip
dma-direct: remove the cached_kernel_address hook
dma-direct now finds the kernel address for coherent allocations based on the dma address, so the cached_kernel_address hooks is unused and can be removed entirely. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/pci-dma.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index 72b6222daa0b..6a685545d5c9 100644
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -88,18 +88,12 @@ void arch_dma_prep_coherent(struct page *page, size_t size)
/*
* Memory caching is platform-dependent in noMMU xtensa configurations.
- * The following two functions should be implemented in platform code
- * in order to enable coherent DMA memory operations when CONFIG_MMU is not
- * enabled.
+ * This function should be implemented in platform code in order to enable
+ * coherent DMA memory operations when CONFIG_MMU is not enabled.
*/
#ifdef CONFIG_MMU
void *uncached_kernel_address(void *p)
{
return p + XCHAL_KSEG_BYPASS_VADDR - XCHAL_KSEG_CACHED_VADDR;
}
-
-void *cached_kernel_address(void *p)
-{
- return p + XCHAL_KSEG_CACHED_VADDR - XCHAL_KSEG_BYPASS_VADDR;
-}
#endif /* CONFIG_MMU */