ASoC: cs35l3x: Use neutral language in amp drivers

Revise variable names and comments in
cs35l35 and cs35l36 amp drivers.

Signed-off-by: David Rhodes <drhodes@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Message-Id: <20210525194439.2232908-1-drhodes@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c
index a4309312e84f368d2bfb0f58acd714c270789bf2..7a5588f1df01a3a2a2254f8987b2eede5e465535 100644 (file)
--- a/sound/soc/codecs/cs35l35.c
+++ b/sound/soc/codecs/cs35l35.c
@@ -368,16 +368,16 @@ static int cs35l35_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
        struct snd_soc_component *component = codec_dai->component;
        struct cs35l35_private *cs35l35 = snd_soc_component_get_drvdata(component);
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
                regmap_update_bits(cs35l35->regmap, CS35L35_CLK_CTL1,
                                    CS35L35_MS_MASK, 1 << CS35L35_MS_SHIFT);
-               cs35l35->slave_mode = false;
+               cs35l35->clock_consumer = false;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_CBC_CFC:
                regmap_update_bits(cs35l35->regmap, CS35L35_CLK_CTL1,
                                    CS35L35_MS_MASK, 0 << CS35L35_MS_SHIFT);
-               cs35l35->slave_mode = true;
+               cs35l35->clock_consumer = true;
                break;
        default:
                return -EINVAL;
@@ -556,8 +556,8 @@ static int cs35l35_hw_params(struct snd_pcm_substream *substream,
                }
                sp_sclks = ((cs35l35->sclk / srate) / 4) - 1;
 
-               /* Only certain ratios are supported in I2S Slave Mode */
-               if (cs35l35->slave_mode) {
+               /* Only certain ratios supported when device is a clock consumer */
+               if (cs35l35->clock_consumer) {
                        switch (sp_sclks) {
                        case CS35L35_SP_SCLKS_32FS:
                        case CS35L35_SP_SCLKS_48FS:
@@ -568,7 +568,7 @@ static int cs35l35_hw_params(struct snd_pcm_substream *substream,
                                return -EINVAL;
                        }
                } else {
-                       /* Only certain ratios supported in I2S MASTER Mode */
+                       /* Only certain ratios supported when device is a clock provider */
                        switch (sp_sclks) {
                        case CS35L35_SP_SCLKS_32FS:
                        case CS35L35_SP_SCLKS_64FS:

diff --git a/sound/soc/codecs/cs35l35.h b/sound/soc/codecs/cs35l35.h
index 2117dcb08c467e9379d9baa2174b43ff96674515..5e4509f41b3219b07a5adb00e5ba7a138baecd4a 100644 (file)
--- a/sound/soc/codecs/cs35l35.h
+++ b/sound/soc/codecs/cs35l35.h
@@ -283,7 +283,7 @@ struct  cs35l35_private {
        int sclk;
        bool pdm_mode;
        bool i2s_mode;
-       bool slave_mode;
+       bool clock_consumer;
        /* GPIO for /RST */
        struct gpio_desc *reset_gpio;
        struct completion pdn_done;

diff --git a/sound/soc/codecs/cs35l36.c b/sound/soc/codecs/cs35l36.c
index db5472b10465b386ae5eb10f50472521c8875a02..d83c1b318c1c46f76f82e4bc723d05e4a5fb063e 100644 (file)
--- a/sound/soc/codecs/cs35l36.c
+++ b/sound/soc/codecs/cs35l36.c
@@ -756,14 +756,14 @@ static int cs35l36_set_dai_fmt(struct snd_soc_dai *component_dai,
 {
        struct cs35l36_private *cs35l36 =
                        snd_soc_component_get_drvdata(component_dai->component);
-       unsigned int asp_fmt, lrclk_fmt, sclk_fmt, slave_mode, clk_frc;
+       unsigned int asp_fmt, lrclk_fmt, sclk_fmt, clock_provider, clk_frc;
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
-               slave_mode = 1;
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
+               clock_provider = 1;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
-               slave_mode = 0;
+       case SND_SOC_DAIFMT_CBC_CFC:
+               clock_provider = 0;
                break;
        default:
                return -EINVAL;
@@ -771,10 +771,10 @@ static int cs35l36_set_dai_fmt(struct snd_soc_dai *component_dai,
 
        regmap_update_bits(cs35l36->regmap, CS35L36_ASP_TX_PIN_CTRL,
                                CS35L36_SCLK_MSTR_MASK,
-                               slave_mode << CS35L36_SCLK_MSTR_SHIFT);
+                               clock_provider << CS35L36_SCLK_MSTR_SHIFT);
        regmap_update_bits(cs35l36->regmap, CS35L36_ASP_RATE_CTRL,
                                CS35L36_LRCLK_MSTR_MASK,
-                               slave_mode << CS35L36_LRCLK_MSTR_SHIFT);
+                               clock_provider << CS35L36_LRCLK_MSTR_SHIFT);
 
        switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) {
        case SND_SOC_DAIFMT_CONT: