Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dec6d14d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

m68k: Add missing dma_sync_single_range_for_{cpu,device}() 



| include/linux/ssb/ssb.h: In function 'ssb_dma_sync_single_range_for_cpu':
| include/linux/ssb/ssb.h:517: error: implicit declaration of function 'dma_sync_single_range_for_cpu'
| include/linux/ssb/ssb.h: In function 'ssb_dma_sync_single_range_for_device':
| include/linux/ssb/ssb.h:538: error: implicit declaration of function 'dma_sync_single_range_for_device'

Add the missing dma_sync_single_range_for_{cpu,device}(), and remove the
`inline' for the non-static function dma_sync_single_for_device().

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ae4833a

arch/m68k/kernel/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ void dma_free_coherent(struct device *dev, size_t size, 
}

EXPORT_SYMBOL(dma_free_coherent);



inline void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,

				       enum dma_data_direction dir)

void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,

				size_t size, enum dma_data_direction dir)

{

	switch (dir) {

	case DMA_TO_DEVICE:

include/asm-m68k/dma-mapping.h

+16 −0
Original line number Diff line number Diff line
@@ -74,6 +74,14 @@ extern void dma_sync_single_for_device(struct device *, dma_addr_t, size_t, 
extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int,

				   enum dma_data_direction);



static inline void dma_sync_single_range_for_device(struct device *dev,

		dma_addr_t dma_handle, unsigned long offset, size_t size,

		enum dma_data_direction direction)

{

	/* just sync everything for now */

	dma_sync_single_for_device(dev, dma_handle, offset + size, direction);

}



static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,

					   size_t size, enum dma_data_direction dir)

{
@@ -84,6 +92,14 @@ static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *s 
{

}



static inline void dma_sync_single_range_for_cpu(struct device *dev,

		dma_addr_t dma_handle, unsigned long offset, size_t size,

		enum dma_data_direction direction)

{

	/* just sync everything for now */

	dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction);

}



static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)

{

	return 0;