diff options
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r-- | include/linux/dmaengine.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 91ac8da25020..96d3e4ab11a9 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -967,8 +967,9 @@ enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); | |||
967 | #ifdef CONFIG_DMA_ENGINE | 967 | #ifdef CONFIG_DMA_ENGINE |
968 | enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); | 968 | enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); |
969 | void dma_issue_pending_all(void); | 969 | void dma_issue_pending_all(void); |
970 | struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); | 970 | struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, |
971 | struct dma_chan *dma_request_slave_channel(struct device *dev, char *name); | 971 | dma_filter_fn fn, void *fn_param); |
972 | struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); | ||
972 | void dma_release_channel(struct dma_chan *chan); | 973 | void dma_release_channel(struct dma_chan *chan); |
973 | #else | 974 | #else |
974 | static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) | 975 | static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) |
@@ -978,13 +979,13 @@ static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descript | |||
978 | static inline void dma_issue_pending_all(void) | 979 | static inline void dma_issue_pending_all(void) |
979 | { | 980 | { |
980 | } | 981 | } |
981 | static inline struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, | 982 | static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, |
982 | dma_filter_fn fn, void *fn_param) | 983 | dma_filter_fn fn, void *fn_param) |
983 | { | 984 | { |
984 | return NULL; | 985 | return NULL; |
985 | } | 986 | } |
986 | static inline struct dma_chan *dma_request_slave_channel(struct device *dev, | 987 | static inline struct dma_chan *dma_request_slave_channel(struct device *dev, |
987 | char *name) | 988 | const char *name) |
988 | { | 989 | { |
989 | return NULL; | 990 | return NULL; |
990 | } | 991 | } |
@@ -1005,9 +1006,9 @@ struct dma_chan *net_dma_find_channel(void); | |||
1005 | __dma_request_slave_channel_compat(&(mask), x, y, dev, name) | 1006 | __dma_request_slave_channel_compat(&(mask), x, y, dev, name) |
1006 | 1007 | ||
1007 | static inline struct dma_chan | 1008 | static inline struct dma_chan |
1008 | *__dma_request_slave_channel_compat(dma_cap_mask_t *mask, dma_filter_fn fn, | 1009 | *__dma_request_slave_channel_compat(const dma_cap_mask_t *mask, |
1009 | void *fn_param, struct device *dev, | 1010 | dma_filter_fn fn, void *fn_param, |
1010 | char *name) | 1011 | struct device *dev, char *name) |
1011 | { | 1012 | { |
1012 | struct dma_chan *chan; | 1013 | struct dma_chan *chan; |
1013 | 1014 | ||