aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dmaengine.h4
-rw-r--r--include/linux/of_dma.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 91ac8da25020..274071ca6f04 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -968,7 +968,7 @@ enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
968enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); 968enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
969void dma_issue_pending_all(void); 969void dma_issue_pending_all(void);
970struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); 970struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param);
971struct dma_chan *dma_request_slave_channel(struct device *dev, char *name); 971struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name);
972void dma_release_channel(struct dma_chan *chan); 972void dma_release_channel(struct dma_chan *chan);
973#else 973#else
974static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) 974static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
@@ -984,7 +984,7 @@ static inline struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask,
984 return NULL; 984 return NULL;
985} 985}
986static inline struct dma_chan *dma_request_slave_channel(struct device *dev, 986static inline struct dma_chan *dma_request_slave_channel(struct device *dev,
987 char *name) 987 const char *name)
988{ 988{
989 return NULL; 989 return NULL;
990} 990}
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index d15073e080dd..ce6a8ab3d2bb 100644
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -40,7 +40,7 @@ extern int of_dma_controller_register(struct device_node *np,
40 void *data); 40 void *data);
41extern int of_dma_controller_free(struct device_node *np); 41extern int of_dma_controller_free(struct device_node *np);
42extern struct dma_chan *of_dma_request_slave_channel(struct device_node *np, 42extern struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
43 char *name); 43 const char *name);
44extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec, 44extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
45 struct of_dma *ofdma); 45 struct of_dma *ofdma);
46#else 46#else
@@ -58,7 +58,7 @@ static inline int of_dma_controller_free(struct device_node *np)
58} 58}
59 59
60static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np, 60static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
61 char *name) 61 const char *name)
62{ 62{
63 return NULL; 63 return NULL;
64} 64}