ASoC: cs4271.c: improve error handling (0d42e6e7) · Commits · e / devices / android_kernel_oneplus_sm8150

sound/soc/codecs/cs4271.c

+44 −15

Original line number	Original line	Diff line number	Diff line
	@@ -209,6 +209,7 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,
	struct snd_soc_codec *codec = codec_dai->codec;		struct snd_soc_codec *codec = codec_dai->codec;
	struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);		struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
	unsigned int val = 0;		unsigned int val = 0;
			int ret;

	switch (format & SND_SOC_DAIFMT_MASTER_MASK) {		switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
	case SND_SOC_DAIFMT_CBS_CFS:		case SND_SOC_DAIFMT_CBS_CFS:
	@@ -226,22 +227,27 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,
	switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {		switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
	case SND_SOC_DAIFMT_LEFT_J:		case SND_SOC_DAIFMT_LEFT_J:
	val \|= CS4271_MODE1_DAC_DIF_LJ;		val \|= CS4271_MODE1_DAC_DIF_LJ;
	snd_soc_update_bits(codec, CS4271_ADCCTL,		ret = snd_soc_update_bits(codec, CS4271_ADCCTL,
	CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_LJ);		CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_LJ);
			if (ret < 0)
			return ret;
	break;		break;
	case SND_SOC_DAIFMT_I2S:		case SND_SOC_DAIFMT_I2S:
	val \|= CS4271_MODE1_DAC_DIF_I2S;		val \|= CS4271_MODE1_DAC_DIF_I2S;
	snd_soc_update_bits(codec, CS4271_ADCCTL,		ret = snd_soc_update_bits(codec, CS4271_ADCCTL,
	CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_I2S);		CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_I2S);
			if (ret < 0)
			return ret;
	break;		break;
	default:		default:
	dev_err(codec->dev, "Invalid DAI format\n");		dev_err(codec->dev, "Invalid DAI format\n");
	return -EINVAL;		return -EINVAL;
	}		}

	snd_soc_update_bits(codec, CS4271_MODE1,		ret = snd_soc_update_bits(codec, CS4271_MODE1,
	CS4271_MODE1_DAC_DIF_MASK \| CS4271_MODE1_MASTER, val);		CS4271_MODE1_DAC_DIF_MASK \| CS4271_MODE1_MASTER, val);
			if (ret < 0)
			return ret;
	return 0;		return 0;
	}		}

	@@ -250,7 +256,7 @@ static int cs4271_deemph[] = {0, 44100, 48000, 32000};
	static int cs4271_set_deemph(struct snd_soc_codec *codec)		static int cs4271_set_deemph(struct snd_soc_codec *codec)
	{		{
	struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);		struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
	int i;		int i, ret;
	int val = CS4271_DACCTL_DEM_DIS;		int val = CS4271_DACCTL_DEM_DIS;

	if (cs4271->deemph) {		if (cs4271->deemph) {
	@@ -263,8 +269,11 @@ static int cs4271_set_deemph(struct snd_soc_codec *codec)
	val <<= 4;		val <<= 4;
	}		}

	return snd_soc_update_bits(codec, CS4271_DACCTL,		ret = snd_soc_update_bits(codec, CS4271_DACCTL,
	CS4271_DACCTL_DEM_MASK, val);		CS4271_DACCTL_DEM_MASK, val);
			if (ret < 0)
			return ret;
			return 0;
	}		}

	static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,		static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
	@@ -294,7 +303,8 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
	struct snd_soc_pcm_runtime *rtd = substream->private_data;		struct snd_soc_pcm_runtime *rtd = substream->private_data;
	struct snd_soc_codec *codec = rtd->codec;		struct snd_soc_codec *codec = rtd->codec;
	struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);		struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
	unsigned int i, ratio, val;		int i, ret;
			unsigned int ratio, val;

	cs4271->rate = params_rate(params);		cs4271->rate = params_rate(params);
	ratio = cs4271->mclk / cs4271->rate;		ratio = cs4271->mclk / cs4271->rate;
	@@ -315,8 +325,10 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
	else		else
	val \|= cs4271_clk_tab[i].mclk_slave;		val \|= cs4271_clk_tab[i].mclk_slave;

	snd_soc_update_bits(codec, CS4271_MODE1,		ret = snd_soc_update_bits(codec, CS4271_MODE1,
	CS4271_MODE1_MODE_MASK \| CS4271_MODE1_DIV_MASK, val);		CS4271_MODE1_MODE_MASK \| CS4271_MODE1_DIV_MASK, val);
			if (ret < 0)
			return ret;

	return cs4271_set_deemph(codec);		return cs4271_set_deemph(codec);
	}		}
	@@ -324,6 +336,7 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
	static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute)		static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute)
	{		{
	struct snd_soc_codec *codec = dai->codec;		struct snd_soc_codec *codec = dai->codec;
			int ret;
	int val_a = 0;		int val_a = 0;
	int val_b = 0;		int val_b = 0;

	@@ -332,8 +345,12 @@ static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute)
	val_b = CS4271_VOLB_MUTE;		val_b = CS4271_VOLB_MUTE;
	}		}

	snd_soc_update_bits(codec, CS4271_VOLA, CS4271_VOLA_MUTE, val_a);		ret = snd_soc_update_bits(codec, CS4271_VOLA, CS4271_VOLA_MUTE, val_a);
	snd_soc_update_bits(codec, CS4271_VOLB, CS4271_VOLB_MUTE, val_b);		if (ret < 0)
			return ret;
			ret = snd_soc_update_bits(codec, CS4271_VOLB, CS4271_VOLB_MUTE, val_b);
			if (ret < 0)
			return ret;

	return 0;		return 0;
	}		}
	@@ -392,17 +409,25 @@ struct snd_soc_dai_driver cs4271_dai = {
	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	static int cs4271_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg)		static int cs4271_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
	{		{
			int ret;
	/* Set power-down bit */		/* Set power-down bit */
	snd_soc_update_bits(codec, CS4271_MODE2, 0, CS4271_MODE2_PDN);		ret = snd_soc_update_bits(codec, CS4271_MODE2, 0, CS4271_MODE2_PDN);
			if (ret < 0)
			return ret;
	return 0;		return 0;
	}		}

	static int cs4271_soc_resume(struct snd_soc_codec *codec)		static int cs4271_soc_resume(struct snd_soc_codec *codec)
	{		{
			int ret;
	/* Restore codec state */		/* Restore codec state */
	snd_soc_cache_sync(codec);		ret = snd_soc_cache_sync(codec);
			if (ret < 0)
			return ret;
	/* then disable the power-down bit */		/* then disable the power-down bit */
	snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0);		ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0);
			if (ret < 0)
			return ret;
	return 0;		return 0;
	}		}
	#else		#else
	@@ -467,9 +492,13 @@ static int cs4271_probe(struct snd_soc_codec *codec)
	return ret;		return ret;
	}		}

	snd_soc_update_bits(codec, CS4271_MODE2, 0,		ret = snd_soc_update_bits(codec, CS4271_MODE2, 0,
	CS4271_MODE2_PDN \| CS4271_MODE2_CPEN);		CS4271_MODE2_PDN \| CS4271_MODE2_CPEN);
	snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0);		if (ret < 0)
			return ret;
			ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0);
			if (ret < 0)
			return ret;
	/* Power-up sequence requires 85 uS */		/* Power-up sequence requires 85 uS */
	udelay(85);		udelay(85);