diff options
author | Becky Bruce <beckyb@kernel.crashing.org> | 2008-12-04 03:12:40 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-15 22:39:33 -0500 |
commit | 0efbb57e06d881a39a7f261e5c33558aedec0f79 (patch) | |
tree | bccb105a263794ac9b3f606906ceb51811ca7141 | |
parent | 46d01492b2c50791b9b66f9b9154ac8d25acaeb9 (diff) |
powerpc: Fix !CONFIG_PPC_NEED_DMA_SYNC_OPS build warning
Change #define stubs of dma_sync ops to be empty static inlines
to avoid build warning.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/include/asm/dma-mapping.h | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h index 9063184fa6fe..86cef7ddc8d5 100644 --- a/arch/powerpc/include/asm/dma-mapping.h +++ b/arch/powerpc/include/asm/dma-mapping.h | |||
@@ -363,12 +363,41 @@ static inline void dma_sync_single_range_for_device(struct device *dev, | |||
363 | size, direction); | 363 | size, direction); |
364 | } | 364 | } |
365 | #else /* CONFIG_PPC_NEED_DMA_SYNC_OPS */ | 365 | #else /* CONFIG_PPC_NEED_DMA_SYNC_OPS */ |
366 | #define dma_sync_single_for_cpu(d, h, s, dir) ((void)0) | 366 | static inline void dma_sync_single_for_cpu(struct device *dev, |
367 | #define dma_sync_single_for_device(d, h, s, dir) ((void)0) | 367 | dma_addr_t dma_handle, size_t size, |
368 | #define dma_sync_single_range_for_cpu(d, h, o, s, dir) ((void)0) | 368 | enum dma_data_direction direction) |
369 | #define dma_sync_single_range_for_device(d, h, o, s, dir) ((void)0) | 369 | { |
370 | #define dma_sync_sg_for_cpu(d, s, n, dir) ((void)0) | 370 | } |
371 | #define dma_sync_sg_for_device(d, s, n, dir) ((void)0) | 371 | |
372 | static inline void dma_sync_single_for_device(struct device *dev, | ||
373 | dma_addr_t dma_handle, size_t size, | ||
374 | enum dma_data_direction direction) | ||
375 | { | ||
376 | } | ||
377 | |||
378 | static inline void dma_sync_sg_for_cpu(struct device *dev, | ||
379 | struct scatterlist *sgl, int nents, | ||
380 | enum dma_data_direction direction) | ||
381 | { | ||
382 | } | ||
383 | |||
384 | static inline void dma_sync_sg_for_device(struct device *dev, | ||
385 | struct scatterlist *sgl, int nents, | ||
386 | enum dma_data_direction direction) | ||
387 | { | ||
388 | } | ||
389 | |||
390 | static inline void dma_sync_single_range_for_cpu(struct device *dev, | ||
391 | dma_addr_t dma_handle, unsigned long offset, size_t size, | ||
392 | enum dma_data_direction direction) | ||
393 | { | ||
394 | } | ||
395 | |||
396 | static inline void dma_sync_single_range_for_device(struct device *dev, | ||
397 | dma_addr_t dma_handle, unsigned long offset, size_t size, | ||
398 | enum dma_data_direction direction) | ||
399 | { | ||
400 | } | ||
372 | #endif | 401 | #endif |
373 | 402 | ||
374 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | 403 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |