diff options
| author |   Geert Uytterhoeven <geert+renesas@glider.be> | 2020-01-21 10:33:10 +0100 |
|---|---|---|
| committer |   Vinod Koul <vkoul@kernel.org> | 2020-01-21 15:05:28 +0530 |
| commit | 71ca5b78235e79c36f774773491064d7921d1942 (patch) | |
| tree | 8eaf305a8354af792571579a433e8f645140ecd8 /include/linux/dmaengine.h | |
| parent | dmaengine: Remove dma_device_satisfies_mask() wrapper (diff) | |
| download | wireguard-linux-71ca5b78235e79c36f774773491064d7921d1942.tar.xz wireguard-linux-71ca5b78235e79c36f774773491064d7921d1942.zip | |
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 a53e28da574a40bc ("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 <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200121093311.28639-3-geert+renesas@glider.be
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 62225d46908b..230d50ef7360 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -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) { @@ -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 * |