From e718fd69e601b381512c23307642b760f9a8ace2 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 22 Dec 2010 14:46:46 +0100 Subject: [PATCH] --- yaml --- r: 223727 b: refs/heads/master c: 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3 h: refs/heads/master i: 223725: bf29aedb78e55b19390e5d948044431fc6db9936 223723: 5d36d1625025d133f7f96090548ee1e454d3780e 223719: 269bedc3ca7416aac181224de1f2df3f4044ef1d 223711: 36f86f2b57a9ada78c90d5bfae81a1b8e71ab37f v: v3 --- [refs] | 2 +- trunk/include/linux/dmaengine.h | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e77037dfc45c..3408ea4fbf22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8333f65ef094e47020cd01452b4637e7daf5a77f +refs/heads/master: 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3 diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index 9d8688b92d8b..8cd00ad98d37 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/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 --- */