Skip to content

Commit

Permalink
DMA: of: Constant names
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Markus Pargmann authored and Vinod Koul committed Apr 15, 2013
1 parent 41ef2d5 commit bef29ec
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion drivers/dma/dmaengine.c
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ EXPORT_SYMBOL_GPL(__dma_request_channel);
* @dev: pointer to client device structure
* @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 (dev->of_node)
Expand Down
6 changes: 3 additions & 3 deletions drivers/dma/of-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ EXPORT_SYMBOL_GPL(of_dma_controller_free);
* specifiers, matches the name provided. Returns 0 if the name matches and
* 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,
struct of_phandle_args *dma_spec)
static int of_dma_match_channel(struct device_node *np, const char *name,
int index, struct of_phandle_args *dma_spec)
{
const char *s;

Expand All @@ -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.
*/
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_dma *ofdma;
Expand Down
4 changes: 2 additions & 2 deletions include/linux/dmaengine.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
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_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)
Expand All @@ -984,7 +984,7 @@ static inline struct dma_chan *__dma_request_channel(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;
}
Expand Down
4 changes: 2 additions & 2 deletions include/linux/of_dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ extern int of_dma_controller_register(struct device_node *np,
void *data);
extern int 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
Expand All @@ -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,
char *name)
const char *name)
{
return NULL;
}
Expand Down

0 comments on commit bef29ec

Please sign in to comment.