GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DMA: of: Constant names

Browse source 
No DMA of-function alters the name, so this patch changes the name arguments
to be constant. Most drivers will probably request DMA channels using a
constant name.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Markus Pargmann 2013-02-24 16:36:09 +01:00 • committed by Vinod Koul
parent 41ef2d5678
commit bef29ec508
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/dma/dmaengine.c
View file

@ -555,7 +555,7 @@ EXPORT_SYMBOL_GPL(__dma_request_channel);
* @dev: pointer to client device structure * @dev: pointer to client device structure
* @name: slave channel name * @name: slave channel name
*/ */
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)
{ {
/* If device-tree is present get slave info from here */ /* If device-tree is present get slave info from here */
if (dev->of_node) if (dev->of_node)

6
drivers/dma/of-dma.c
View file

@ -172,8 +172,8 @@ EXPORT_SYMBOL_GPL(of_dma_controller_free);
* specifiers, matches the name provided. Returns 0 if the name matches and * specifiers, matches the name provided. Returns 0 if the name matches and
* a valid pointer to the DMA specifier is found. Otherwise returns -ENODEV. * a valid pointer to the DMA specifier is found. Otherwise returns -ENODEV.
*/ */
static int of_dma_match_channel(struct device_node *np, char *name, int index, static int of_dma_match_channel(struct device_node *np, const char *name,
struct of_phandle_args *dma_spec) int index, struct of_phandle_args *dma_spec)
{ {
const char *s; const char *s;
@ -198,7 +198,7 @@ static int of_dma_match_channel(struct device_node *np, char *name, int index,
* Returns pointer to appropriate dma channel on success or NULL on error. * Returns pointer to appropriate dma channel on success or NULL on error.
*/ */
struct dma_chan *of_dma_request_slave_channel(struct device_node *np, struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
char *name) const char *name)
{ {
struct of_phandle_args dma_spec; struct of_phandle_args dma_spec;
struct of_dma *ofdma; struct of_dma *ofdma;

4
include/linux/dmaengine.h
View file

@ -968,7 +968,7 @@ enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
void dma_issue_pending_all(void); void dma_issue_pending_all(void);
struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); struct dma_chan *__dma_request_channel(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); void dma_release_channel(struct dma_chan *chan);
#else #else
static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) static 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,
return NULL; return NULL;
} }
static inline struct dma_chan *dma_request_slave_channel(struct device *dev, static inline struct dma_chan *dma_request_slave_channel(struct device *dev,
char *name) const char *name)
{ {
return NULL; return NULL;
} }

4
include/linux/of_dma.h
View file

@ -40,7 +40,7 @@ extern int of_dma_controller_register(struct device_node *np,
void *data); void *data);
extern int of_dma_controller_free(struct device_node *np); extern int of_dma_controller_free(struct device_node *np);
extern struct dma_chan *of_dma_request_slave_channel(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, extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
struct of_dma *ofdma); struct of_dma *ofdma);
#else #else
@ -58,7 +58,7 @@ static inline int of_dma_controller_free(struct device_node *np)
} }
static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np, static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
char *name) const char *name)
{ {
return NULL; return NULL;
} }