ASoC: samsung: bells: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87frk1a3kf.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 365b1aca4855c885e0b59a1101475d8edb86374f..ba9b0b1fba035b3b9e586b476db124d96dd92729 100644 (file)
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -256,14 +256,14 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = {
                .name = "CPU-DSP",
                .stream_name = "CPU-DSP",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                SND_SOC_DAILINK_REG(wm2200_cpu_dsp),
        },
        {
                .name = "DSP-CODEC",
                .stream_name = "DSP-CODEC",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .c2c_params = &sub_params,
                .num_c2c_params = 1,
                .ignore_suspend = 1,
@@ -293,14 +293,14 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
                .name = "CPU-DSP",
                .stream_name = "CPU-DSP",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                SND_SOC_DAILINK_REG(wm5102_cpu_dsp),
        },
        {
                .name = "DSP-CODEC",
                .stream_name = "DSP-CODEC",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .c2c_params = &sub_params,
                .num_c2c_params = 1,
                .ignore_suspend = 1,
@@ -310,7 +310,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
                .name = "Baseband",
                .stream_name = "Baseband",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .ignore_suspend = 1,
                .c2c_params = &baseband_params,
                .num_c2c_params = 1,
@@ -320,7 +320,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
                .name = "Sub",
                .stream_name = "Sub",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBS_CFS,
+                               | SND_SOC_DAIFMT_CBC_CFC,
                .ignore_suspend = 1,
                .c2c_params = &sub_params,
                .num_c2c_params = 1,
@@ -351,14 +351,14 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
                .name = "CPU-DSP",
                .stream_name = "CPU-DSP",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                SND_SOC_DAILINK_REG(wm5110_cpu_dsp),
        },
        {
                .name = "DSP-CODEC",
                .stream_name = "DSP-CODEC",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .c2c_params = &sub_params,
                .num_c2c_params = 1,
                .ignore_suspend = 1,
@@ -368,7 +368,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
                .name = "Baseband",
                .stream_name = "Baseband",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .ignore_suspend = 1,
                .c2c_params = &baseband_params,
                .num_c2c_params = 1,
@@ -378,7 +378,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
                .name = "Sub",
                .stream_name = "Sub",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBS_CFS,
+                               | SND_SOC_DAIFMT_CBC_CFC,
                .ignore_suspend = 1,
                .c2c_params = &sub_params,
                .num_c2c_params = 1,