Patchwork powerpc: Fix !CONFIG_PPC_NEED_DMA_SYNC_OPS build warning

login
register
mail settings
Submitter Becky Bruce
Date Dec. 4, 2008, 6:12 p.m.
Message ID <1228414360-9699-1-git-send-email-beckyb@kernel.crashing.org>
Download mbox | patch
Permalink /patch/12300/
State Accepted
Commit 0efbb57e06d881a39a7f261e5c33558aedec0f79
Headers show

Comments

Becky Bruce - Dec. 4, 2008, 6:12 p.m.
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>
---
 arch/powerpc/include/asm/dma-mapping.h |   41 +++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 6 deletions(-)
Stephen Rothwell - Dec. 4, 2008, 11:43 p.m.
Hi Becky,

On Thu,  4 Dec 2008 12:12:40 -0600 Becky Bruce <beckyb@kernel.crashing.org> wrote:
>
> 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>

Build tested for ppc64_defconfig.

Patch

diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
index 9063184..86cef7d 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,
 					      size, direction);
 }
 #else /* CONFIG_PPC_NEED_DMA_SYNC_OPS */
-#define dma_sync_single_for_cpu(d, h, s, dir) ((void)0)
-#define dma_sync_single_for_device(d, h, s, dir) ((void)0)
-#define dma_sync_single_range_for_cpu(d, h, o, s, dir) ((void)0)
-#define dma_sync_single_range_for_device(d, h, o, s, dir) ((void)0)
-#define dma_sync_sg_for_cpu(d, s, n, dir) ((void)0)
-#define dma_sync_sg_for_device(d, s, n, dir) ((void)0)
+static inline void dma_sync_single_for_cpu(struct device *dev,
+		dma_addr_t dma_handle, size_t size,
+		enum dma_data_direction direction)
+{
+}
+
+static inline void dma_sync_single_for_device(struct device *dev,
+		dma_addr_t dma_handle, size_t size,
+		enum dma_data_direction direction)
+{
+}
+
+static inline void dma_sync_sg_for_cpu(struct device *dev,
+		struct scatterlist *sgl, int nents,
+		enum dma_data_direction direction)
+{
+}
+
+static inline void dma_sync_sg_for_device(struct device *dev,
+		struct scatterlist *sgl, int nents,
+		enum dma_data_direction direction)
+{
+}
+
+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)
+{
+}
+
+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)
+{
+}
 #endif
 
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)