projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74fc96e
)
ASoC: sh: convert not to use dma_request_slave_channel()
author
Christophe JAILLET
<christophe.jaillet@wanadoo.fr>
Sun, 19 Nov 2023 18:19:14 +0000
(19:19 +0100)
committer
Mark Brown
<broonie@kernel.org>
Mon, 27 Nov 2023 13:44:06 +0000
(13:44 +0000)
dma_request_slave_channel() is deprecated. dma_request_chan() should
be used directly instead.
Switch to the preferred function and update the error handling accordingly.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link:
https://lore.kernel.org/r/1a837f96f056fa3dcb02a77afa5892d40b354cb1.1700417934.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/fsi.c
patch
|
blob
|
history
diff --git
a/sound/soc/sh/fsi.c
b/sound/soc/sh/fsi.c
index 2ef47aa2c7786308ae0e40b8c246399bd0fd86c1..84601ba43b7d1cef69e874fbdaa7845413223b86 100644
(file)
--- a/
sound/soc/sh/fsi.c
+++ b/
sound/soc/sh/fsi.c
@@
-1379,7
+1379,9
@@
static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct dev
io->chan = dma_request_channel(mask, shdma_chan_filter,
(void *)io->dma_id);
#else
- io->chan = dma_request_slave_channel(dev, is_play ? "tx" : "rx");
+ io->chan = dma_request_chan(dev, is_play ? "tx" : "rx");
+ if (IS_ERR(io->chan))
+ io->chan = NULL;
#endif
if (io->chan) {
struct dma_slave_config cfg = {};