Commit 71ca5b78 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Vinod Koul

dmaengine: Remove dma_request_slave_channel_compat() wrapper

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 a53e28da ("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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200121093311.28639-3-geert+renesas@glider.beSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 69b1189b
...@@ -1526,11 +1526,9 @@ struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); ...@@ -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); struct dma_chan *dma_get_any_slave_channel(struct dma_device *device);
#define dma_request_channel(mask, x, y) \ #define dma_request_channel(mask, x, y) \
__dma_request_channel(&(mask), x, y, NULL) __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 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, dma_filter_fn fn, void *fn_param,
struct device *dev, const char *name) struct device *dev, const char *name)
{ {
...@@ -1543,7 +1541,7 @@ static inline struct dma_chan ...@@ -1543,7 +1541,7 @@ static inline struct dma_chan
if (!fn || !fn_param) if (!fn || !fn_param)
return NULL; return NULL;
return __dma_request_channel(mask, fn, fn_param, NULL); return __dma_request_channel(&mask, fn, fn_param, NULL);
} }
static inline char * static inline char *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment