Unverified Commit d3964aff authored by Dan Murphy's avatar Dan Murphy Committed by Mark Brown
Browse files

ASoC: tas2770: Fix the spacing and new lines 



Fix up the spacing for argument alignment and add new lines to separate
code. Eliminate unneccessary goto statements when the error code could
just be returned.

Signed-off-by: default avatarDan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20200918190548.12598-8-dmurphy@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ec9377dc

sound/soc/codecs/tas2770.c

+131 −169
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static void tas2770_reset(struct tas2770_priv *tas2770) 
		msleep(20);

		gpiod_set_value_cansleep(tas2770->reset_gpio, 1);

	}



	snd_soc_component_write(tas2770->component, TAS2770_SW_RST,

		TAS2770_RST);

}
@@ -51,27 +52,24 @@ static int tas2770_set_bias_level(struct snd_soc_component *component, 


	switch (level) {

	case SND_SOC_BIAS_ON:

		snd_soc_component_update_bits(component,

			TAS2770_PWR_CTRL,

		snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

					      TAS2770_PWR_CTRL_MASK,

					      TAS2770_PWR_CTRL_ACTIVE);

		break;

	case SND_SOC_BIAS_STANDBY:

	case SND_SOC_BIAS_PREPARE:

		snd_soc_component_update_bits(component,

			TAS2770_PWR_CTRL,

			TAS2770_PWR_CTRL_MASK, TAS2770_PWR_CTRL_MUTE);

		snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

					      TAS2770_PWR_CTRL_MASK,

					      TAS2770_PWR_CTRL_MUTE);

		break;

	case SND_SOC_BIAS_OFF:

		snd_soc_component_update_bits(component,

			TAS2770_PWR_CTRL,

		snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

					      TAS2770_PWR_CTRL_MASK,

					      TAS2770_PWR_CTRL_SHUTDOWN);

		break;



	default:

		dev_err(tas2770->dev,

				"wrong power level setting %d\n", level);

		dev_err(tas2770->dev, "wrong power level setting %d\n", level);

		return -EINVAL;

	}
@@ -83,11 +81,9 @@ static int tas2770_codec_suspend(struct snd_soc_component *component) 
{

	int ret;



	ret = snd_soc_component_update_bits(component,

		TAS2770_PWR_CTRL,

	ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

					    TAS2770_PWR_CTRL_MASK,

					    TAS2770_PWR_CTRL_SHUTDOWN);



	if (ret < 0)

		return ret;
@@ -98,11 +94,9 @@ static int tas2770_codec_resume(struct snd_soc_component *component) 
{

	int ret;



	ret = snd_soc_component_update_bits(component,

		TAS2770_PWR_CTRL,

	ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

					    TAS2770_PWR_CTRL_MASK,

					    TAS2770_PWR_CTRL_ACTIVE);



	if (ret < 0)

		return ret;
@@ -135,14 +129,12 @@ static int tas2770_dac_event(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		ret = snd_soc_component_update_bits(component,

			TAS2770_PWR_CTRL,

		ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

						    TAS2770_PWR_CTRL_MASK,

						    TAS2770_PWR_CTRL_MUTE);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		ret = snd_soc_component_update_bits(component,

			TAS2770_PWR_CTRL,

		ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

						    TAS2770_PWR_CTRL_MASK,

						    TAS2770_PWR_CTRL_SHUTDOWN);

		break;
@@ -164,12 +156,9 @@ static const struct snd_kcontrol_new vsense_switch = 


static const struct snd_soc_dapm_widget tas2770_dapm_widgets[] = {

	SND_SOC_DAPM_AIF_IN("ASI1", "ASI1 Playback", 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_MUX("ASI1 Sel", SND_SOC_NOPM, 0, 0,

				&tas2770_asi1_mux),

	SND_SOC_DAPM_SWITCH("ISENSE", TAS2770_PWR_CTRL, 3, 1,

			&isense_switch),

	SND_SOC_DAPM_SWITCH("VSENSE", TAS2770_PWR_CTRL, 2, 1,

			&vsense_switch),

	SND_SOC_DAPM_MUX("ASI1 Sel", SND_SOC_NOPM, 0, 0, &tas2770_asi1_mux),

	SND_SOC_DAPM_SWITCH("ISENSE", TAS2770_PWR_CTRL, 3, 1, &isense_switch),

	SND_SOC_DAPM_SWITCH("VSENSE", TAS2770_PWR_CTRL, 2, 1, &vsense_switch),

	SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, tas2770_dac_event,

			   SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

	SND_SOC_DAPM_OUTPUT("OUT"),
@@ -194,13 +183,11 @@ static int tas2770_mute(struct snd_soc_dai *dai, int mute, int direction) 
	int ret;



	if (mute)

		ret = snd_soc_component_update_bits(component,

			TAS2770_PWR_CTRL,

		ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

						    TAS2770_PWR_CTRL_MASK,

						    TAS2770_PWR_CTRL_MUTE);

	else

		ret = snd_soc_component_update_bits(component,

			TAS2770_PWR_CTRL,

		ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,

						    TAS2770_PWR_CTRL_MASK,

						    TAS2770_PWR_CTRL_ACTIVE);
@@ -217,22 +204,19 @@ static int tas2770_set_bitwidth(struct tas2770_priv *tas2770, int bitwidth) 


	switch (bitwidth) {

	case SNDRV_PCM_FORMAT_S16_LE:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG2,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG2,

						    TAS2770_TDM_CFG_REG2_RXW_MASK,

						    TAS2770_TDM_CFG_REG2_RXW_16BITS);

		tas2770->v_sense_slot = tas2770->i_sense_slot + 2;

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG2,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG2,

						    TAS2770_TDM_CFG_REG2_RXW_MASK,

						    TAS2770_TDM_CFG_REG2_RXW_24BITS);

		tas2770->v_sense_slot = tas2770->i_sense_slot + 4;

		break;

	case SNDRV_PCM_FORMAT_S32_LE:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG2,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG2,

						    TAS2770_TDM_CFG_REG2_RXW_MASK,

						    TAS2770_TDM_CFG_REG2_RXW_32BITS);

		tas2770->v_sense_slot = tas2770->i_sense_slot + 4;
@@ -247,8 +231,7 @@ static int tas2770_set_bitwidth(struct tas2770_priv *tas2770, int bitwidth) 


	tas2770->channel_size = bitwidth;



	ret = snd_soc_component_update_bits(component,

		TAS2770_TDM_CFG_REG5,

	ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG5,

					    TAS2770_TDM_CFG_REG5_VSNS_MASK |

					    TAS2770_TDM_CFG_REG5_50_MASK,

					    TAS2770_TDM_CFG_REG5_VSNS_ENABLE |
@@ -256,8 +239,7 @@ static int tas2770_set_bitwidth(struct tas2770_priv *tas2770, int bitwidth) 
	if (ret < 0)

		return ret;



	ret = snd_soc_component_update_bits(component,

		TAS2770_TDM_CFG_REG6,

	ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG6,

					    TAS2770_TDM_CFG_REG6_ISNS_MASK |

					    TAS2770_TDM_CFG_REG6_50_MASK,

					    TAS2770_TDM_CFG_REG6_ISNS_ENABLE |
@@ -275,80 +257,68 @@ static int tas2770_set_samplerate(struct tas2770_priv *tas2770, int samplerate) 


	switch (samplerate) {

	case 48000:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_SMP_MASK,

						    TAS2770_TDM_CFG_REG0_SMP_48KHZ);

		if (ret < 0)

			return ret;



		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_31_MASK,

						    TAS2770_TDM_CFG_REG0_31_44_1_48KHZ);

		break;

	case 44100:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_SMP_MASK,

						    TAS2770_TDM_CFG_REG0_SMP_44_1KHZ);

		if (ret < 0)

			return ret;



		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_31_MASK,

						    TAS2770_TDM_CFG_REG0_31_44_1_48KHZ);

		break;

	case 96000:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_SMP_MASK,

						    TAS2770_TDM_CFG_REG0_SMP_48KHZ);

		if (ret < 0)

			return ret;



		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_31_MASK,

						    TAS2770_TDM_CFG_REG0_31_88_2_96KHZ);

		break;

	case 88200:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_SMP_MASK,

						    TAS2770_TDM_CFG_REG0_SMP_44_1KHZ);

		if (ret < 0)

			return ret;



		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_31_MASK,

						    TAS2770_TDM_CFG_REG0_31_88_2_96KHZ);

		break;

	case 19200:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_SMP_MASK,

						    TAS2770_TDM_CFG_REG0_SMP_48KHZ);

		if (ret < 0)

			return ret;



		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_31_MASK,

						    TAS2770_TDM_CFG_REG0_31_176_4_192KHZ);

		break;

	case 17640:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_SMP_MASK,

						    TAS2770_TDM_CFG_REG0_SMP_44_1KHZ);

		if (ret < 0)

			return ret;



		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG0,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0,

						    TAS2770_TDM_CFG_REG0_31_MASK,

						    TAS2770_TDM_CFG_REG0_31_176_4_192KHZ);

		break;
@@ -373,23 +343,19 @@ static int tas2770_hw_params(struct snd_pcm_substream *substream, 
	int ret;



	ret = tas2770_set_bitwidth(tas2770, params_format(params));

	if (ret < 0)

		goto end;





	ret = tas2770_set_samplerate(tas2770, params_rate(params));



end:

	if (ret)

		return ret;



	return tas2770_set_samplerate(tas2770, params_rate(params));

}



static int tas2770_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)

{

	u8 tdm_rx_start_slot = 0, asi_cfg_1 = 0;

	int ret;

	struct snd_soc_component *component = dai->component;

	struct tas2770_priv *tas2770 =

			snd_soc_component_get_drvdata(component);

	u8 tdm_rx_start_slot = 0, asi_cfg_1 = 0;

	int ret;



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:
@@ -464,6 +430,7 @@ static int tas2770_set_dai_tdm_slot(struct snd_soc_dai *dai, 
	if (slots == 1) {

		if (tx_mask != 1)

			return -EINVAL;



		left_slot = 0;

		right_slot = 0;

	} else {
@@ -493,31 +460,24 @@ static int tas2770_set_dai_tdm_slot(struct snd_soc_dai *dai, 


	switch (slot_width) {

	case 16:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG2,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG2,

						    TAS2770_TDM_CFG_REG2_RXS_MASK,

						    TAS2770_TDM_CFG_REG2_RXS_16BITS);

		break;



	case 24:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG2,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG2,

						    TAS2770_TDM_CFG_REG2_RXS_MASK,

						    TAS2770_TDM_CFG_REG2_RXS_24BITS);

		break;



	case 32:

		ret = snd_soc_component_update_bits(component,

			TAS2770_TDM_CFG_REG2,

		ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG2,

						    TAS2770_TDM_CFG_REG2_RXS_MASK,

						    TAS2770_TDM_CFG_REG2_RXS_32BITS);

		break;



	case 0:

		/* Do not change slot width */

		ret = 0;

		break;



	default:

		ret = -EINVAL;

	}
@@ -585,10 +545,8 @@ static DECLARE_TLV_DB_SCALE(tas2770_playback_volume, -12750, 50, 0); 


static const struct snd_kcontrol_new tas2770_snd_controls[] = {

	SOC_SINGLE_TLV("Speaker Playback Volume", TAS2770_PLAY_CFG_REG2,

		0, TAS2770_PLAY_CFG_REG2_VMAX, 1,

		tas2770_playback_volume),

	SOC_SINGLE_TLV("Amp Gain Volume", TAS2770_PLAY_CFG_REG0,

		0, 0x14, 0,

		       0, TAS2770_PLAY_CFG_REG2_VMAX, 1, tas2770_playback_volume),

	SOC_SINGLE_TLV("Amp Gain Volume", TAS2770_PLAY_CFG_REG0, 0, 0x14, 0,

		       tas2770_digital_tlv),

};
@@ -650,6 +608,7 @@ static bool tas2770_volatile(struct device *dev, unsigned int reg) 
	case TAS2770_TEMP_LSB:

		return true;

	}



	return false;

}
@@ -668,6 +627,7 @@ static bool tas2770_writeable(struct device *dev, unsigned int reg) 
	case TAS2770_REV_AND_GPID:

		return false;

	}



	return true;

}
@@ -705,6 +665,7 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770) 
	if (rc) {

		dev_info(tas2770->dev, "Property %s is missing setting default slot\n",

			 "ti,asi-format");



		tas2770->asi_format = 0;

	}
@@ -713,6 +674,7 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770) 
	if (rc) {

		dev_info(tas2770->dev, "Property %s is missing setting default slot\n",

			 "ti,imon-slot-no");



		tas2770->i_sense_slot = 0;

	}
@@ -721,6 +683,7 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770) 
	if (rc) {

		dev_info(tas2770->dev, "Property %s is missing setting default slot\n",

			 "ti,vmon-slot-no");



		tas2770->v_sense_slot = 2;

	}
@@ -733,14 +696,15 @@ static int tas2770_i2c_probe(struct i2c_client *client, 
	struct tas2770_priv *tas2770;

	int result;



	tas2770 = devm_kzalloc(&client->dev,

		sizeof(struct tas2770_priv), GFP_KERNEL);

	tas2770 = devm_kzalloc(&client->dev, sizeof(struct tas2770_priv),

			       GFP_KERNEL);

	if (!tas2770)

		return -ENOMEM;

	tas2770->dev = &client->dev;



	tas2770->dev = &client->dev;

	i2c_set_clientdata(client, tas2770);

	dev_set_drvdata(&client->dev, tas2770);



	tas2770->power_state = TAS2770_POWER_SHUTDOWN;



	tas2770->regmap = devm_regmap_init_i2c(client, &tas2770_i2c_regmap);
@@ -748,7 +712,7 @@ static int tas2770_i2c_probe(struct i2c_client *client, 
		result = PTR_ERR(tas2770->regmap);

		dev_err(&client->dev, "Failed to allocate register map: %d\n",

			result);

		goto end;

		return result;

	}



	if (client->dev.of_node) {
@@ -756,7 +720,7 @@ static int tas2770_i2c_probe(struct i2c_client *client, 
		if (result) {

			dev_err(tas2770->dev, "%s: Failed to parse devicetree\n",

				__func__);

			goto end;

			return result;

		}

	}
@@ -776,7 +740,6 @@ static int tas2770_i2c_probe(struct i2c_client *client, 
	if (result)

		dev_err(tas2770->dev, "Register codec failed.\n");



end:

	return result;

}
@@ -802,7 +765,6 @@ static struct i2c_driver tas2770_i2c_driver = { 
	.probe      = tas2770_i2c_probe,

	.id_table   = tas2770_i2c_id,

};



module_i2c_driver(tas2770_i2c_driver);



MODULE_AUTHOR("Shi Fu <shifu0704@thundersoft.com>");