diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-05-02 21:52:26 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-05-02 21:52:26 +0530 |
| commit | b2396f7984ea09e83d489cfca6d5da62cc22945a (patch) | |
| tree | 43e42015e6279af397ec1358a99afcc280b0cfab /include | |
| parent | 42361f20f29021bfee8d9b5f651362dca83fd705 (diff) | |
| parent | de61608acf89779c8831aaa1428b6975d49d98c0 (diff) | |
| download | linux-stable-b2396f7984ea09e83d489cfca6d5da62cc22945a.tar.gz linux-stable-b2396f7984ea09e83d489cfca6d5da62cc22945a.tar.bz2 linux-stable-b2396f7984ea09e83d489cfca6d5da62cc22945a.zip | |
Merge branch 'topic/of' into for-linus
Conflicts:
include/linux/dmaengine.h
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmaengine.h | 4 | ||||
| -rw-r--r-- | include/linux/of_dma.h | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index dd6d21b335c8..96d3e4ab11a9 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -969,7 +969,7 @@ 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(struct device *dev, char *name); +struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); 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) @@ -985,7 +985,7 @@ 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(struct device *dev, - char *name) + const char *name) { return NULL; } diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h index d15073e080dd..364dda734877 100644 --- a/include/linux/of_dma.h +++ b/include/linux/of_dma.h @@ -25,7 +25,6 @@ struct of_dma { struct dma_chan *(*of_dma_xlate) (struct of_phandle_args *, struct of_dma *); void *of_dma_data; - int use_count; }; struct of_dma_filter_info { @@ -38,9 +37,9 @@ extern int of_dma_controller_register(struct device_node *np, struct dma_chan *(*of_dma_xlate) (struct of_phandle_args *, struct of_dma *), void *data); -extern int of_dma_controller_free(struct device_node *np); +extern void of_dma_controller_free(struct device_node *np); extern struct dma_chan *of_dma_request_slave_channel(struct device_node *np, - char *name); + const char *name); extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma); #else @@ -52,13 +51,12 @@ static inline int of_dma_controller_register(struct device_node *np, return -ENODEV; } -static inline int of_dma_controller_free(struct device_node *np) +static inline void of_dma_controller_free(struct device_node *np) { - return -ENODEV; } static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np, - char *name) + const char *name) { return NULL; } |