Commit 72f05009 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-7.0-2026-02-13' of... 

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)
parents 44331bd6 8a840ab0

include/linux/dma-map-ops.h

+0 −8
Original line number Diff line number Diff line
@@ -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);

kernel/dma/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -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

kernel/dma/direct.c

+0 −3
Original line number Diff line number Diff line
@@ -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))

kernel/dma/direct.h

+0 −3
Original line number Diff line number Diff line
@@ -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,