Skip to content

Commit 2cbd530

Browse files
morimotobroonie
authored andcommitted
ASoC: pxa: merge DAI call back functions into ops
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: 446b31e ("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>
1 parent 4244cf3 commit 2cbd530

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/soc/pxa/pxa2xx-i2s.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ static int pxa2xx_i2s_remove(struct snd_soc_dai *dai)
329329
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000)
330330

331331
static const struct snd_soc_dai_ops pxa_i2s_dai_ops = {
332+
.probe = pxa2xx_i2s_probe,
333+
.remove = pxa2xx_i2s_remove,
332334
.startup = pxa2xx_i2s_startup,
333335
.shutdown = pxa2xx_i2s_shutdown,
334336
.trigger = pxa2xx_i2s_trigger,
@@ -338,8 +340,6 @@ static const struct snd_soc_dai_ops pxa_i2s_dai_ops = {
338340
};
339341

340342
static struct snd_soc_dai_driver pxa_i2s_dai = {
341-
.probe = pxa2xx_i2s_probe,
342-
.remove = pxa2xx_i2s_remove,
343343
.playback = {
344344
.channels_min = 2,
345345
.channels_max = 2,

0 commit comments

Comments
 (0)