ASoC: codec: arizona: 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/878qptbi6z.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 402b9a2ff02406a91440414e6a983a3e1c36972f..6bb1e8698d41213420cbb4600effd6269ebede1e 100644 (file)
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1457,7 +1457,7 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                break;
        case SND_SOC_DAIFMT_DSP_B:
                if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)
-                               != SND_SOC_DAIFMT_CBM_CFM) {
+                               != SND_SOC_DAIFMT_CBP_CFP) {
                        arizona_aif_err(dai, "DSP_B not valid in slave mode\n");
                        return -EINVAL;
                }
@@ -1468,7 +1468,7 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                break;
        case SND_SOC_DAIFMT_LEFT_J:
                if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)
-                               != SND_SOC_DAIFMT_CBM_CFM) {
+                               != SND_SOC_DAIFMT_CBP_CFP) {
                        arizona_aif_err(dai, "LEFT_J not valid in slave mode\n");
                        return -EINVAL;
                }
@@ -1481,15 +1481,15 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        }
 
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_CBC_CFC:
                break;
-       case SND_SOC_DAIFMT_CBS_CFM:
+       case SND_SOC_DAIFMT_CBC_CFP:
                lrclk |= ARIZONA_AIF1TX_LRCLK_MSTR;
                break;
-       case SND_SOC_DAIFMT_CBM_CFS:
+       case SND_SOC_DAIFMT_CBP_CFC:
                bclk |= ARIZONA_AIF1_BCLK_MSTR;
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_CBP_CFP:
                bclk |= ARIZONA_AIF1_BCLK_MSTR;
                lrclk |= ARIZONA_AIF1TX_LRCLK_MSTR;
                break;