Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dbe6f1869188b6e04e38aa861dd198befb08bcd7

Authored by FUJITA Tomonori
Committed by Linus Torvalds
1 parent d68412b6d1
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: FUJITA 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 14 additions and 3 deletions Side-by-side Diff

include/linux/dma-mapping.h
Diff comments   View file @ dbe6f18
... ... @@ -109,9 +109,20 @@
109 109 #include <asm-generic/dma-mapping-broken.h>
110 110 #endif
111 111  
112   -/* Backwards compat, remove in 2.7.x */
113   -#define dma_sync_single dma_sync_single_for_cpu
114   -#define dma_sync_sg dma_sync_sg_for_cpu
  112 +/* for backwards compatibility, removed soon */
  113 +static inline void __deprecated dma_sync_single(struct device *dev,
  114 + dma_addr_t addr, size_t size,
  115 + enum dma_data_direction dir)
  116 +{
  117 + dma_sync_single_for_cpu(dev, addr, size, dir);
  118 +}
  119 +
  120 +static inline void __deprecated dma_sync_sg(struct device *dev,
  121 + struct scatterlist *sg, int nelems,
  122 + enum dma_data_direction dir)
  123 +{
  124 + dma_sync_sg_for_cpu(dev, sg, nelems, dir);
  125 +}
115 126  
116 127 static inline u64 dma_get_mask(struct device *dev)
117 128 {