projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d3155a
)
ASoC: jz4740: merge DAI call back functions into ops
author
Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com>
Tue, 8 Aug 2023 22:57:24 +0000
(22:57 +0000)
committer
Mark Brown
<broonie@kernel.org>
Mon, 14 Aug 2023 12:10:21 +0000
(13:10 +0100)
ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link:
https://lore.kernel.org/r/87y1il9m7f.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/jz4740/jz4740-i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/jz4740/jz4740-i2s.c
b/sound/soc/jz4740/jz4740-i2s.c
index 578af21769c9db7cfa7ce1f04c8185e2b948c058..51761953161589f5851123ecaa3406a33076dda2 100644
(file)
--- a/
sound/soc/jz4740/jz4740-i2s.c
+++ b/
sound/soc/jz4740/jz4740-i2s.c
@@
-328,6
+328,7
@@
static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai)
}
static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = {
+ .probe = jz4740_i2s_dai_probe,
.startup = jz4740_i2s_startup,
.shutdown = jz4740_i2s_shutdown,
.trigger = jz4740_i2s_trigger,
@@
-341,7
+342,6
@@
static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = {
SNDRV_PCM_FMTBIT_S24_LE)
static struct snd_soc_dai_driver jz4740_i2s_dai = {
- .probe = jz4740_i2s_dai_probe,
.playback = {
.channels_min = 1,
.channels_max = 2,
@@
-384,7
+384,6
@@
static const struct i2s_soc_info x1000_i2s_soc_info = {
};
static struct snd_soc_dai_driver jz4770_i2s_dai = {
- .probe = jz4740_i2s_dai_probe,
.playback = {
.channels_min = 1,
.channels_max = 2,