dma-mapping: Remove dma_mark_clean (again)

With IA-64 now gone, there are no users of the dma_mark_clean hook,
so we can retire it for good.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/c004927f01962726ff1dcf94d1b4efff84db805a.1767727673.git.robin.murphy@arm.com

diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h
index 4809204c674cc273e25d0e0a05a2a666a84095ee..64349e1b6535aad62047a4e1d30399e022432763 100644 (file)
--- a/include/linux/dma-map-ops.h
+++ b/include/linux/dma-map-ops.h
@@ -377,14 +377,6 @@ static inline void arch_dma_prep_coherent(struct page *page, size_t size)
 }
 #endif /* CONFIG_ARCH_HAS_DMA_PREP_COHERENT */
 
-#ifdef CONFIG_ARCH_HAS_DMA_MARK_CLEAN
-void arch_dma_mark_clean(phys_addr_t paddr, size_t size);
-#else
-static inline void arch_dma_mark_clean(phys_addr_t paddr, size_t size)
-{
-}
-#endif /* ARCH_HAS_DMA_MARK_CLEAN */
-
 void *arch_dma_set_uncached(void *addr, size_t size);
 void arch_dma_clear_uncached(void *addr, size_t size);
 

diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
index 31cfdb6b4bc3e33c239111955d97b3ec160baafa..159900736f25ba3cbeb60c84f85a9dfd6638f425 100644 (file)
--- a/kernel/dma/Kconfig
+++ b/kernel/dma/Kconfig
@@ -47,12 +47,6 @@ config ARCH_HAS_DMA_SET_MASK
 config ARCH_HAS_DMA_WRITE_COMBINE
        bool
 
-#
-# Select if the architectures provides the arch_dma_mark_clean hook
-#
-config ARCH_HAS_DMA_MARK_CLEAN
-       bool
-
 config DMA_DECLARE_COHERENT
        bool
 

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 50c3fe2a1d550d95290914fd640de45a46a9d2e4..c9fa983990cd2368426e17716c71a3e172072213 100644 (file)
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -425,9 +425,6 @@ void dma_direct_sync_sg_for_cpu(struct device *dev,
                        arch_sync_dma_for_cpu(paddr, sg->length, dir);
 
                swiotlb_sync_single_for_cpu(dev, paddr, sg->length, dir);
-
-               if (dir == DMA_FROM_DEVICE)
-                       arch_dma_mark_clean(paddr, sg->length);
        }
 
        if (!dev_is_dma_coherent(dev))

diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h
index da2fadf45bcd6c6034f636ef952a4436fcc30364..f476c63b668c90220a7802ad482b4e65617f1cc3 100644 (file)
--- a/kernel/dma/direct.h
+++ b/kernel/dma/direct.h
@@ -75,9 +75,6 @@ static inline void dma_direct_sync_single_for_cpu(struct device *dev,
        }
 
        swiotlb_sync_single_for_cpu(dev, paddr, size, dir);
-
-       if (dir == DMA_FROM_DEVICE)
-               arch_dma_mark_clean(paddr, size);
 }
 
 static inline dma_addr_t dma_direct_map_phys(struct device *dev,