diff mbox series

ASoC: cs35l3x: Use neutral language in amp drivers

Message ID 20201019224427.1700003-1-david.rhodes@cirrus.com
State New, archived
Headers show
Series ASoC: cs35l3x: Use neutral language in amp drivers | expand

Commit Message

David Rhodes Oct. 19, 2020, 10:44 p.m. UTC
Revise variable names and comments in
cs35l35 and cs35l36 amp drivers.

Signed-off-by: David Rhodes <david.rhodes@cirrus.com>
---
 sound/soc/codecs/cs35l35.c | 10 +++++-----
 sound/soc/codecs/cs35l35.h |  2 +-
 sound/soc/codecs/cs35l36.c | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

Comments

Mark Brown Oct. 20, 2020, 12:09 p.m. UTC | #1
On Mon, Oct 19, 2020 at 05:44:27PM -0500, David Rhodes wrote:

> -		/* Only certain ratios are supported in I2S Slave Mode */
> -		if (cs35l35->slave_mode) {
> +		/* Only certain ratios are supported in I2S Device Mode */
> +		if (cs35l35->clock_mode) {

> -			/* Only certain ratios supported in I2S MASTER Mode */
> +			/* Only certain ratios supported in I2S Controller Mode */

Your renaming moves this to a boolean variable called clock mode which
maps onto device and controller.  I am not sure people are going to be
able to follow that.  Perhaps clock_source or something?
diff mbox series

Patch

diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c
index e330427..3774b69 100644
--- a/sound/soc/codecs/cs35l35.c
+++ b/sound/soc/codecs/cs35l35.c
@@ -372,12 +372,12 @@  static int cs35l35_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	case SND_SOC_DAIFMT_CBM_CFM:
 		regmap_update_bits(cs35l35->regmap, CS35L35_CLK_CTL1,
 				    CS35L35_MS_MASK, 1 << CS35L35_MS_SHIFT);
-		cs35l35->slave_mode = false;
+		cs35l35->clock_mode = false;
 		break;
 	case SND_SOC_DAIFMT_CBS_CFS:
 		regmap_update_bits(cs35l35->regmap, CS35L35_CLK_CTL1,
 				    CS35L35_MS_MASK, 0 << CS35L35_MS_SHIFT);
-		cs35l35->slave_mode = true;
+		cs35l35->clock_mode = 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 are supported in I2S Device Mode */
+		if (cs35l35->clock_mode) {
 			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 in I2S Controller Mode */
 			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 ffb154c..017fa6d 100644
--- a/sound/soc/codecs/cs35l35.h
+++ b/sound/soc/codecs/cs35l35.h
@@ -282,7 +282,7 @@  struct  cs35l35_private {
 	int sclk;
 	bool pdm_mode;
 	bool i2s_mode;
-	bool slave_mode;
+	bool clock_mode;
 	/* 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 e9b5f76..86f5533 100644
--- 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_mode, clk_frc;
 
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
 	case SND_SOC_DAIFMT_CBM_CFM:
-		slave_mode = 1;
+		clock_mode = 1;
 		break;
 	case SND_SOC_DAIFMT_CBS_CFS:
-		slave_mode = 0;
+		clock_mode = 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_mode << CS35L36_SCLK_MSTR_SHIFT);
 	regmap_update_bits(cs35l36->regmap, CS35L36_ASP_RATE_CTRL,
 				CS35L36_LRCLK_MSTR_MASK,
-				slave_mode << CS35L36_LRCLK_MSTR_SHIFT);
+				clock_mode << CS35L36_LRCLK_MSTR_SHIFT);
 
 	switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) {
 	case SND_SOC_DAIFMT_CONT: