aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-10-06 09:05:29 +0000
committerDan Williams <dan.j.williams@intel.com>2010-10-07 14:56:36 -0700
commit9646b7985e906e5fcea9375f016b4519c8318c21 (patch)
tree78466dd3825da4ac2ff864e6c246265e5f524f8a
parent661385f9c34e15c2f2c57b80e8cb2c7b910fdbd3 (diff)
downloadmrst-s0i3-test-9646b7985e906e5fcea9375f016b4519c8318c21.tar.gz
mrst-s0i3-test-9646b7985e906e5fcea9375f016b4519c8318c21.tar.xz
mrst-s0i3-test-9646b7985e906e5fcea9375f016b4519c8318c21.zip
DMAENGINE: define a dummy filter function for ste_dma40
All platform data has to be made conditional on CONFIG_STEDMA40 or we can provide a simple dummy filter functions as to avoid cluttering the code with other #ifdef:s. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--arch/arm/plat-nomadik/include/plat/ste_dma40.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 660552d33b3..3dd42551de0 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -162,6 +162,8 @@ struct stedma40_platform_data {
int disabled_channels[STEDMA40_MAX_PHYS];
};
+#ifdef CONFIG_STE_DMA40
+
/**
* stedma40_filter() - Provides stedma40_chan_cfg to the
* ste_dma40 dma driver via the dmaengine framework.
@@ -223,4 +225,21 @@ dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
direction, flags);
}
+#else
+static inline bool stedma40_filter(struct dma_chan *chan, void *data)
+{
+ return false;
+}
+
+static inline struct
+dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
+ dma_addr_t addr,
+ unsigned int size,
+ enum dma_data_direction direction,
+ unsigned long flags)
+{
+ return NULL;
+}
+#endif
+
#endif