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:
2fb00b8
)
ASoC: pxa: merge DAI call back functions into ops
author
Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com>
Tue, 8 Aug 2023 22:56:22 +0000
(22:56 +0000)
committer
Mark Brown
<broonie@kernel.org>
Mon, 14 Aug 2023 12:09:26 +0000
(13:09 +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/87cyzxb0tl.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/pxa/pxa-ssp.c
patch
|
blob
|
history
diff --git
a/sound/soc/pxa/pxa-ssp.c
b/sound/soc/pxa/pxa-ssp.c
index
d19769d
..
b70034c
100644
(file)
--- a/
sound/soc/pxa/pxa-ssp.c
+++ b/
sound/soc/pxa/pxa-ssp.c
@@
-813,6
+813,8
@@
static int pxa_ssp_remove(struct snd_soc_dai *dai)
#define PXA_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)
static const struct snd_soc_dai_ops pxa_ssp_dai_ops = {
+ .probe = pxa_ssp_probe,
+ .remove = pxa_ssp_remove,
.startup = pxa_ssp_startup,
.shutdown = pxa_ssp_shutdown,
.trigger = pxa_ssp_trigger,
@@
-824,8
+826,6
@@
static const struct snd_soc_dai_ops pxa_ssp_dai_ops = {
};
static struct snd_soc_dai_driver pxa_ssp_dai = {
- .probe = pxa_ssp_probe,
- .remove = pxa_ssp_remove,
.playback = {
.channels_min = 1,
.channels_max = 8,