Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: codecs/cx2072x: merge DAI call back functions into ops

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/87fs4t9m4y.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
878b5fee e22a907d

+9 -2
+9 -2
sound/soc/codecs/cx2072x.c
··· 1546 1546 return 0; 1547 1547 } 1548 1548 1549 + static const struct snd_soc_dai_ops cx2072x_dai_ops2 = { 1550 + .probe = cx2072x_dsp_dai_probe, 1551 + .set_sysclk = cx2072x_set_dai_sysclk, 1552 + .set_fmt = cx2072x_set_dai_fmt, 1553 + .hw_params = cx2072x_hw_params, 1554 + .set_bclk_ratio = cx2072x_set_dai_bclk_ratio, 1555 + }; 1556 + 1549 1557 #define CX2072X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) 1550 1558 1551 1559 static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = { ··· 1580 1572 { /* plabayck only, return echo reference to Conexant DSP chip */ 1581 1573 .name = "cx2072x-dsp", 1582 1574 .id = CX2072X_DAI_DSP, 1583 - .probe = cx2072x_dsp_dai_probe, 1584 1575 .playback = { 1585 1576 .stream_name = "DSP Playback", 1586 1577 .channels_min = 2, ··· 1587 1580 .rates = CX2072X_RATES_DSP, 1588 1581 .formats = CX2072X_FORMATS, 1589 1582 }, 1590 - .ops = &cx2072x_dai_ops, 1583 + .ops = &cx2072x_dai_ops2, 1591 1584 }, 1592 1585 { /* plabayck only, return echo reference through I2S TX */ 1593 1586 .name = "cx2072x-aec",