diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-12-22 14:46:46 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-01-03 01:41:40 -0800 |
| commit | 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3 (patch) | |
| tree | f94ab5a72d00cd7fb7c061ed68f1d8e5e1f85cde | |
| parent | 8333f65ef094e47020cd01452b4637e7daf5a77f (diff) | |
| download | linux-3.10-8f33d5277fada0291ea495f7fd44a3e7b7aa41d3.tar.gz linux-3.10-8f33d5277fada0291ea495f7fd44a3e7b7aa41d3.tar.bz2 linux-3.10-8f33d5277fada0291ea495f7fd44a3e7b7aa41d3.zip | |
dmaengine: provide dummy functions for DMA_ENGINE=n
This lets drivers, optionally using the dmaengine, build with DMA_ENGINE
unselected.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
| -rw-r--r-- | include/linux/dmaengine.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 9d8688b92d8..8cd00ad98d3 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -824,6 +824,8 @@ enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); #ifdef CONFIG_DMA_ENGINE enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); void dma_issue_pending_all(void); +struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); +void dma_release_channel(struct dma_chan *chan); #else static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) { @@ -831,7 +833,14 @@ static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descript } static inline void dma_issue_pending_all(void) { - do { } while (0); +} +static inline struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, + dma_filter_fn fn, void *fn_param) +{ + return NULL; +} +static inline void dma_release_channel(struct dma_chan *chan) +{ } #endif @@ -842,8 +851,6 @@ void dma_async_device_unregister(struct dma_device *device); void dma_run_dependencies(struct dma_async_tx_descriptor *tx); struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type); #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) -struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); -void dma_release_channel(struct dma_chan *chan); /* --- Helper iov-locking functions --- */ |