Skip to content

Commit

Permalink
dmaengine: Remove dma_request_slave_channel_compat() wrapper
Browse files Browse the repository at this point in the history
At its original introduction, dma_request_slave_channel_compat() used a
wrapper, to accommodate filter functions that modify the mask passed.
Filter functions can no longer modify masks, and the mask parameter was
made const in commit a53e28d ("dma: Make the 'mask' parameter
of __dma_request_channel const") consecutively.

Hence remove the wrapper, and rename __dma_request_slave_channel_compat()
to dma_request_slave_channel_compat(), to get rid of one more function
name starting with a double underscore.

Signed-off-by: Geert Uytterhoeven <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Vinod Koul <[email protected]>
  • Loading branch information
geertu authored and vinodkoul committed Jan 21, 2020
1 parent 69b1189 commit 71ca5b7
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions include/linux/dmaengine.h
Original file line number Diff line number Diff line change
Expand Up @@ -1526,11 +1526,9 @@ struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
struct dma_chan *dma_get_any_slave_channel(struct dma_device *device);
#define dma_request_channel(mask, x, y) \
__dma_request_channel(&(mask), x, y, NULL)
#define dma_request_slave_channel_compat(mask, x, y, dev, name) \
__dma_request_slave_channel_compat(&(mask), x, y, dev, name)

static inline struct dma_chan
*__dma_request_slave_channel_compat(const dma_cap_mask_t *mask,
*dma_request_slave_channel_compat(const dma_cap_mask_t mask,
dma_filter_fn fn, void *fn_param,
struct device *dev, const char *name)
{
Expand All @@ -1543,7 +1541,7 @@ static inline struct dma_chan
if (!fn || !fn_param)
return NULL;

return __dma_request_channel(mask, fn, fn_param, NULL);
return __dma_request_channel(&mask, fn, fn_param, NULL);
}

static inline char *
Expand Down

0 comments on commit 71ca5b7

Please sign in to comment.