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

Commit dbe6f186 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

dma-mapping: mark dma_sync_single and dma_sync_sg as deprecated 



dma_sync_single() and dma_sync_sg() have been described as "Backwards
compat, remove in 2.7.x" for a long time (since 2.6.5).

This marks dma_sync_single() and dma_sync_sg() as deprecated so the users
get notified before removing them.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d68412b6

include/linux/dma-mapping.h

+14 −3
Original line number Diff line number Diff line
@@ -109,9 +109,20 @@ static inline int is_buffer_dma_capable(u64 mask, dma_addr_t addr, size_t size) 
#include <asm-generic/dma-mapping-broken.h>

#endif



/* Backwards compat, remove in 2.7.x */

#define dma_sync_single		dma_sync_single_for_cpu

#define dma_sync_sg		dma_sync_sg_for_cpu

/* for backwards compatibility, removed soon */

static inline void __deprecated dma_sync_single(struct device *dev,

						dma_addr_t addr, size_t size,

						enum dma_data_direction dir)

{

	dma_sync_single_for_cpu(dev, addr, size, dir);

}



static inline void __deprecated dma_sync_sg(struct device *dev,

					    struct scatterlist *sg, int nelems,

					    enum dma_data_direction dir)

{

	dma_sync_sg_for_cpu(dev, sg, nelems, dir);

}



static inline u64 dma_get_mask(struct device *dev)

{