diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2014-01-07 21:32:28 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-07 21:32:28 +0530 |
| commit | 4fce628f685945df4fd6fa1cab6f7eb397dc9267 (patch) | |
| tree | 56427ef9cea9b6ca11c66d6dd6b50a73402b62ad /include/linux/dmaengine.h | |
| parent | dma: pl08x: allow zero slave channels (diff) | |
| parent | dma: add channel request API that supports deferred probe (diff) | |
| download | linux-dev-4fce628f685945df4fd6fa1cab6f7eb397dc9267.tar.xz linux-dev-4fce628f685945df4fd6fa1cab6f7eb397dc9267.zip | |
Merge branch 'topic/defer_probe' into for-linus
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index bd6b88222ced..de550c61ba43 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -22,6 +22,7 @@ #define LINUX_DMAENGINE_H #include <linux/device.h> +#include <linux/err.h> #include <linux/uio.h> #include <linux/bug.h> #include <linux/scatterlist.h> @@ -1039,6 +1040,8 @@ 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(const dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); +struct dma_chan *dma_request_slave_channel_reason(struct device *dev, + const char *name); struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); void dma_release_channel(struct dma_chan *chan); #else @@ -1062,6 +1065,11 @@ static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, { return NULL; } +static inline struct dma_chan *dma_request_slave_channel_reason( + struct device *dev, const char *name) +{ + return ERR_PTR(-ENODEV); +} static inline struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name) { |