ASoC: samsung: switch to use c2c_params instead of params

ASoC is now using c2c_params instead of params. This patch replace it.
num_c2c_params (was num_params) was not mandatory before,
but let's set it by this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87jzytc2kp.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c
index 0fbbf3b02c09570fb531b86acb402868808ed5bf..7492bb41456c700744c00630351f9995540dfeae 100644 (file)
--- a/sound/soc/samsung/aries_wm8994.c
+++ b/sound/soc/samsung/aries_wm8994.c
@@ -483,14 +483,16 @@ static struct snd_soc_dai_link aries_dai[] = {
                .name = "WM8994 AIF2",
                .stream_name = "Baseband",
                .init = &aries_baseband_init,
-               .params = &baseband_params,
+               .c2c_params = &baseband_params,
+               .num_c2c_params = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(baseband),
        },
        {
                .name = "WM8994 AIF3",
                .stream_name = "Bluetooth",
-               .params = &bluetooth_params,
+               .c2c_params = &bluetooth_params,
+               .num_c2c_params = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(bluetooth),
        },

diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 76998a4a4cad39abb5988807f06cbfebcc6c2677..70b63d4faa993bb0111212f4717f7e7a435fda61 100644 (file)
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -264,7 +264,8 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = {
                .stream_name = "DSP-CODEC",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
-               .params = &sub_params,
+               .c2c_params = &sub_params,
+               .num_c2c_params = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(wm2200_dsp_codec),
        },
@@ -300,7 +301,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
                .stream_name = "DSP-CODEC",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
-               .params = &sub_params,
+               .c2c_params = &sub_params,
+               .num_c2c_params = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(wm5102_dsp_codec),
        },
@@ -310,7 +312,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .ignore_suspend = 1,
-               .params = &baseband_params,
+               .c2c_params = &baseband_params,
+               .num_c2c_params = 1,
                SND_SOC_DAILINK_REG(wm5102_baseband),
        },
        {
@@ -319,7 +322,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBS_CFS,
                .ignore_suspend = 1,
-               .params = &sub_params,
+               .c2c_params = &sub_params,
+               .num_c2c_params = 1,
                SND_SOC_DAILINK_REG(wm5102_sub),
        },
 };
@@ -355,7 +359,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
                .stream_name = "DSP-CODEC",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
-               .params = &sub_params,
+               .c2c_params = &sub_params,
+               .num_c2c_params = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(wm5110_dsp_codec),
        },
@@ -365,7 +370,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .ignore_suspend = 1,
-               .params = &baseband_params,
+               .c2c_params = &baseband_params,
+               .num_c2c_params = 1,
                SND_SOC_DAILINK_REG(wm5110_baseband),
        },
        {
@@ -374,7 +380,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBS_CFS,
                .ignore_suspend = 1,
-               .params = &sub_params,
+               .c2c_params = &sub_params,
+               .num_c2c_params = 1,
                SND_SOC_DAILINK_REG(wm5110_sub),
        },
 };

diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c
index 411e25cec5913a823059fecd255b47b5043bda9c..5d8118e69359395a48d3b306fece8e6d46a67329 100644 (file)
--- a/sound/soc/samsung/littlemill.c
+++ b/sound/soc/samsung/littlemill.c
@@ -167,7 +167,8 @@ static struct snd_soc_dai_link littlemill_dai[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .ignore_suspend = 1,
-               .params = &baseband_params,
+               .c2c_params = &baseband_params,
+               .num_c2c_params = 1,
                SND_SOC_DAILINK_REG(baseband),
        },
 };

diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c
index b44f5e92224f731ca4f02d0908ea9902f099e966..106770be6fc5afae3ba5a4aa0b69c99b7011b3b9 100644 (file)
--- a/sound/soc/samsung/lowland.c
+++ b/sound/soc/samsung/lowland.c
@@ -119,7 +119,8 @@ static struct snd_soc_dai_link lowland_dai[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                                SND_SOC_DAIFMT_CBM_CFM,
                .ignore_suspend = 1,
-               .params = &sub_params,
+               .c2c_params = &sub_params,
+               .num_c2c_params = 1,
                .init = lowland_wm9081_init,
                SND_SOC_DAILINK_REG(speaker),
        },

diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 69d7b0115b38d3e1de9fc892ad7162abe10ad2b4..22e2ad63d64dac1b325ac1aa0d8550351357dc55 100644 (file)
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -219,7 +219,8 @@ static struct snd_soc_dai_link speyside_dai[] = {
                .init = speyside_wm8996_init,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
-               .params = &dsp_codec_params,
+               .c2c_params = &dsp_codec_params,
+               .num_c2c_params = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(dsp_codec),
        },