Skip to content

Commit 72f0500

Browse files
committed
Merge tag 'dma-mapping-7.0-2026-02-13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux
Pull dma-mapping update from Marek Szyprowski: "A small code cleanup for the DMA-mapping subsystem: removal of unused hooks (Robin Murphy)" * tag 'dma-mapping-7.0-2026-02-13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux: dma-mapping: Remove dma_mark_clean (again)
2 parents 44331bd + 8a840ab commit 72f0500

4 files changed

Lines changed: 0 additions & 20 deletions

File tree

include/linux/dma-map-ops.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,14 +377,6 @@ static inline void arch_dma_prep_coherent(struct page *page, size_t size)
377377
}
378378
#endif /* CONFIG_ARCH_HAS_DMA_PREP_COHERENT */
379379

380-
#ifdef CONFIG_ARCH_HAS_DMA_MARK_CLEAN
381-
void arch_dma_mark_clean(phys_addr_t paddr, size_t size);
382-
#else
383-
static inline void arch_dma_mark_clean(phys_addr_t paddr, size_t size)
384-
{
385-
}
386-
#endif /* ARCH_HAS_DMA_MARK_CLEAN */
387-
388380
void *arch_dma_set_uncached(void *addr, size_t size);
389381
void arch_dma_clear_uncached(void *addr, size_t size);
390382

kernel/dma/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ config ARCH_HAS_DMA_SET_MASK
4747
config ARCH_HAS_DMA_WRITE_COMBINE
4848
bool
4949

50-
#
51-
# Select if the architectures provides the arch_dma_mark_clean hook
52-
#
53-
config ARCH_HAS_DMA_MARK_CLEAN
54-
bool
55-
5650
config DMA_DECLARE_COHERENT
5751
bool
5852

kernel/dma/direct.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,6 @@ void dma_direct_sync_sg_for_cpu(struct device *dev,
425425
arch_sync_dma_for_cpu(paddr, sg->length, dir);
426426

427427
swiotlb_sync_single_for_cpu(dev, paddr, sg->length, dir);
428-
429-
if (dir == DMA_FROM_DEVICE)
430-
arch_dma_mark_clean(paddr, sg->length);
431428
}
432429

433430
if (!dev_is_dma_coherent(dev))

kernel/dma/direct.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ static inline void dma_direct_sync_single_for_cpu(struct device *dev,
7575
}
7676

7777
swiotlb_sync_single_for_cpu(dev, paddr, size, dir);
78-
79-
if (dir == DMA_FROM_DEVICE)
80-
arch_dma_mark_clean(paddr, size);
8178
}
8279

8380
static inline dma_addr_t dma_direct_map_phys(struct device *dev,

0 commit comments

Comments
 (0)