ASoC: cs4271.c: adapt to error handling introduced in snd_soc_update_bits()
Subsystems (3)
PATCH 1/1 ASoC: cs4271.c: adapt to error handling introduced in snd_soc_update_bits()
From: Alexander Sverdlin <[email protected]>
CS4271 CODEC driver adapted to recently introduced error handling in snd_soc_update_bits().
Signed-off-by Alexander Sverdlin <[email protected]>
--- sound/soc/codecs/cs4271.c | 58 +++++++++++++++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 15 deletions(-)
sound/soc/codecs/cs4271.c +43 -15
@@ -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 cs4271_private *cs4271 =snd_soc_codec_get_drvdata (codec);unsigned int val =0 ; +int ret;switch (format &SND_SOC_DAIFMT_MASTER_MASK ) {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 ) {case SND_SOC_DAIFMT_LEFT_J : 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 ); +if (ret <0 ) +return ret;break ;case SND_SOC_DAIFMT_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 ); +if (ret <0 ) +return ret;break ;default :dev_err (codec->dev,"Invalid DAI format\n" );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); - +if (ret <0 ) +return ret;return 0 ; }
@@ -263,8 +269,10 @@ static int cs4271_set_deemph(struct snd_soc_codec *codec) val <<=4 ; } -return snd_soc_update_bits (codec,CS4271_DACCTL , -CS4271_DACCTL_DEM_MASK , val); + i =snd_soc_update_bits (codec,CS4271_DACCTL ,CS4271_DACCTL_DEM_MASK , val); +if (i <0 ) +return i; +return 0 ; } static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
@@ -294,7 +302,8 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_codec *codec = rtd->codec;struct cs4271_private *cs4271 =snd_soc_codec_get_drvdata (codec); -unsigned int i, ratio, val; +int i; +unsigned int ratio, val; cs4271->rate =params_rate (params); ratio = cs4271->mclk / cs4271->rate;
@@ -315,8 +324,10 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,else val |= cs4271_clk_tab[i].mclk_slave; -snd_soc_update_bits (codec,CS4271_MODE1 , + i =snd_soc_update_bits (codec,CS4271_MODE1 ,CS4271_MODE1_MODE_MASK |CS4271_MODE1_DIV_MASK , val); +if (i <0 ) +return i;return cs4271_set_deemph (codec); }
@@ -324,6 +335,7 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,static int cs4271_digital_mute (struct snd_soc_dai *dai,int mute) {struct snd_soc_codec *codec = dai->codec; +int ret;int val_a =0 ;int val_b =0 ;
@@ -332,8 +344,12 @@ static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute) val_b =CS4271_VOLB_MUTE ; } -snd_soc_update_bits (codec,CS4271_VOLA ,CS4271_VOLA_MUTE , val_a); -snd_soc_update_bits (codec,CS4271_VOLB ,CS4271_VOLB_MUTE , val_b); + ret =snd_soc_update_bits (codec,CS4271_VOLA ,CS4271_VOLA_MUTE , val_a); +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 ; }
@@ -392,17 +408,25 @@ struct snd_soc_dai_driver cs4271_dai = {#ifdef CONFIG_PM static int cs4271_soc_suspend (struct snd_soc_codec *codec,pm_message_t mesg) { +int ret;/* 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 ; }static int cs4271_soc_resume (struct snd_soc_codec *codec) { +int ret;/* 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 */ -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 ; }#else
@@ -467,9 +491,13 @@ static int cs4271_probe(struct snd_soc_codec *codec)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 ); -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 */ udelay (85 );
sound/soc/codecs/cs4271.c static int cs4271_set_deemph(struct snd_soc_codec *codec) · line 275
Quoted 6 lines · Alexander
sound/soc/codecs/cs4271.c +4
-2-return snd_soc_update_bits (codec,CS4271_DACCTL , -CS4271_DACCTL_DEM_MASK , val); + i =snd_soc_update_bits (codec,CS4271_DACCTL ,CS4271_DACCTL_DEM_MASK , val); +if (i <0 ) +return i; +return 0 ;
It'd seem a bit more tasteful to declare a 'ret' variable rather than reusing i as you do here and in another hunk.
sound/soc/codecs/cs4271.c struct snd_soc_dai_driver cs4271_dai = { · line 425
Quoted 8 lines
static int
cs4271_soc_resume(struct snd_soc_codec *codec){sound/soc/codecs/cs4271.c +4
-1+int ret;/* Restore codec state */ -snd_soc_cache_sync (codec); + ret =snd_soc_cache_sync (codec); +if (ret <0 ) +return ret;
This isn't connected to snd_soc_update_bits()....