OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4244cf3
)
ASoC: pxa: merge DAI call back functions into ops
author
Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com>
Tue, 22 Aug 2023 01:11:23 +0000
(
01:11
+0000)
committer
Mark Brown
<broonie@kernel.org>
Tue, 22 Aug 2023 11:48:31 +0000
(12:48 +0100)
ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/
202308151142
.hoM5o9LV-lkp@intel.com/
Fixes:
446b31e89493
("ASoC: soc-dai.h: remove unused call back functions")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link:
https://lore.kernel.org/r/878ra3ubid.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/pxa/pxa2xx-i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/pxa/pxa2xx-i2s.c
b/sound/soc/pxa/pxa2xx-i2s.c
index
1063650
..
437bfcc
100644
(file)
--- a/
sound/soc/pxa/pxa2xx-i2s.c
+++ b/
sound/soc/pxa/pxa2xx-i2s.c
@@
-329,6
+329,8
@@
static int pxa2xx_i2s_remove(struct snd_soc_dai *dai)
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000)
static const struct snd_soc_dai_ops pxa_i2s_dai_ops = {
+ .probe = pxa2xx_i2s_probe,
+ .remove = pxa2xx_i2s_remove,
.startup = pxa2xx_i2s_startup,
.shutdown = pxa2xx_i2s_shutdown,
.trigger = pxa2xx_i2s_trigger,
@@
-338,8
+340,6
@@
static const struct snd_soc_dai_ops pxa_i2s_dai_ops = {
};
static struct snd_soc_dai_driver pxa_i2s_dai = {
- .probe = pxa2xx_i2s_probe,
- .remove = pxa2xx_i2s_remove,
.playback = {
.channels_min = 2,
.channels_max = 2,