ASoC: ad1836: Use params_width() rather than explicit memory format
Subsystems (3)
Mark Brown
maintainerPATCH 1/5 ASoC: ad1836: Use params_width() rather than explicit memory format
From: Mark Brown <[email protected]>
--- sound/soc/codecs/ad1836.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/ad1836.c +5 -5
@@ -168,15 +168,15 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream,int word_len =0 ;/* bit size */ -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : word_len =AD1836_WORD_LEN_16 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : word_len =AD1836_WORD_LEN_20 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : -case SNDRV_PCM_FORMAT_S32_LE : +case 24 : +case 32 : word_len =AD1836_WORD_LEN_24 ;break ;default :
Signature · 1 line
1.8.5.2
Mark Brown
maintainerPATCH 2/5 ASoC: ad193x: Use params_width() rather than memory format
From: Mark Brown <[email protected]>
--- sound/soc/codecs/ad193x.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/ad193x.c +5 -5
@@ -249,15 +249,15 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream,struct ad193x_priv *ad193x =snd_soc_codec_get_drvdata (codec);/* bit size */ -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : word_len =3 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : word_len =1 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : -case SNDRV_PCM_FORMAT_S32_LE : +case 24 : +case 32 : word_len =0 ;break ; }
Signature · 1 line
1.8.5.2
Mark Brown
maintainerPATCH 3/5 ASoC: adau1373: Use params_width() rather than memory format
In reply to Mark BrownFrom: Mark Brown <[email protected]>
--- sound/soc/codecs/adau1373.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/adau1373.c +5 -5
@@ -1078,17 +1078,17 @@ static int adau1373_hw_params(struct snd_pcm_substream *substream,ADAU1373_BCLKDIV_SR_MASK |ADAU1373_BCLKDIV_BCLK_MASK , (div << 2) | ADAU1373_BCLKDIV_64); -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : ctrl =ADAU1373_DAI_WLEN_16 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : ctrl =ADAU1373_DAI_WLEN_20 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : ctrl =ADAU1373_DAI_WLEN_24 ;break ; -case SNDRV_PCM_FORMAT_S32_LE : +case 32 : ctrl =ADAU1373_DAI_WLEN_32 ;break ;default :
Signature · 1 line
1.8.5.2
Mark Brown
maintainerPATCH 4/5 ASoC: adau1701: Use params_width() rather than memory format
In reply to Mark BrownFrom: Mark Brown <[email protected]>
--- sound/soc/codecs/adau1701.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
sound/soc/codecs/adau1701.c +16 -18
@@ -299,20 +299,20 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv) }static int adau1701_set_capture_pcm_format (struct snd_soc_codec *codec, -snd_pcm_format_t format) +struct snd_pcm_hw_params *params) {struct adau1701 *adau1701 =snd_soc_codec_get_drvdata (codec);unsigned int mask =ADAU1701_SEROCTL_WORD_LEN_MASK ;unsigned int val; -switch (format) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : val =ADAU1701_SEROCTL_WORD_LEN_16 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : val =ADAU1701_SEROCTL_WORD_LEN_20 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : val =ADAU1701_SEROCTL_WORD_LEN_24 ;break ;default :
@@ -320,14 +320,14 @@ static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec, }if (adau1701->dai_fmt ==SND_SOC_DAIFMT_RIGHT_J ) { -switch (format) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : val |=ADAU1701_SEROCTL_MSB_DEALY16 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : val |=ADAU1701_SEROCTL_MSB_DEALY12 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : val |=ADAU1701_SEROCTL_MSB_DEALY8 ;break ; }
@@ -340,7 +340,7 @@ static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec, }static int adau1701_set_playback_pcm_format (struct snd_soc_codec *codec, -snd_pcm_format_t format) +struct snd_pcm_hw_params *params) {struct adau1701 *adau1701 =snd_soc_codec_get_drvdata (codec);unsigned int val;
@@ -348,14 +348,14 @@ static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec,if (adau1701->dai_fmt !=SND_SOC_DAIFMT_RIGHT_J )return 0 ; -switch (format) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : val =ADAU1701_SERICTL_RIGHTJ_16 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : val =ADAU1701_SERICTL_RIGHTJ_20 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : val =ADAU1701_SERICTL_RIGHTJ_24 ;break ;default :
@@ -374,7 +374,6 @@ static int adau1701_hw_params(struct snd_pcm_substream *substream,struct snd_soc_codec *codec = dai->codec;struct adau1701 *adau1701 =snd_soc_codec_get_drvdata (codec);unsigned int clkdiv = adau1701->sysclk /params_rate (params); -snd_pcm_format_t format;unsigned int val;int ret;
@@ -406,11 +405,10 @@ static int adau1701_hw_params(struct snd_pcm_substream *substream,regmap_update_bits (adau1701->regmap,ADAU1701_DSPCTRL ,ADAU1701_DSPCTRL_SR_MASK , val); - format =params_format (params);if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) -return adau1701_set_playback_pcm_format (codec, format); +return adau1701_set_playback_pcm_format (codec, params);else -return adau1701_set_capture_pcm_format (codec, format); +return adau1701_set_capture_pcm_format (codec, params); } static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai,
Signature · 1 line
1.8.5.2
Mark Brown
maintainerPATCH 5/5 ASoC: adav80x: Use params_width() rather than memory format
In reply to Mark BrownFrom: Mark Brown <[email protected]>
--- sound/soc/codecs/adav80x.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-)
sound/soc/codecs/adav80x.c +14 -16
@@ -453,22 +453,22 @@ static int adav80x_set_dac_clock(struct snd_soc_codec *codec, }static int adav80x_set_capture_pcm_format (struct snd_soc_codec *codec, -struct snd_soc_dai *dai,snd_pcm_format_t format) +struct snd_soc_dai *dai,struct snd_pcm_hw_params *params) {struct adav80x *adav80x =snd_soc_codec_get_drvdata (codec);unsigned int val; -switch (format) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : val =ADAV80X_CAPTURE_WORD_LEN16 ;break ; -case SNDRV_PCM_FORMAT_S18_3LE : +case 18 : val =ADAV80X_CAPTRUE_WORD_LEN18 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : val =ADAV80X_CAPTURE_WORD_LEN20 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : val =ADAV80X_CAPTURE_WORD_LEN24 ;break ;default :
@@ -482,7 +482,7 @@ static int adav80x_set_capture_pcm_format(struct snd_soc_codec *codec, }static int adav80x_set_playback_pcm_format (struct snd_soc_codec *codec, -struct snd_soc_dai *dai,snd_pcm_format_t format) +struct snd_soc_dai *dai,struct snd_pcm_hw_params *params) {struct adav80x *adav80x =snd_soc_codec_get_drvdata (codec);unsigned int val;
@@ -490,17 +490,17 @@ static int adav80x_set_playback_pcm_format(struct snd_soc_codec *codec,if (adav80x->dai_fmt[dai->id] !=SND_SOC_DAIFMT_RIGHT_J )return 0 ; -switch (format) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : val =ADAV80X_PLAYBACK_MODE_RIGHT_J_16 ;break ; -case SNDRV_PCM_FORMAT_S18_3LE : +case 18 : val =ADAV80X_PLAYBACK_MODE_RIGHT_J_18 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : val =ADAV80X_PLAYBACK_MODE_RIGHT_J_20 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : val =ADAV80X_PLAYBACK_MODE_RIGHT_J_24 ;break ;default :
@@ -524,12 +524,10 @@ static int adav80x_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { -adav80x_set_playback_pcm_format (codec, dai, -params_format (params)); +adav80x_set_playback_pcm_format (codec, dai, params);adav80x_set_dac_clock (codec, rate); }else { -adav80x_set_capture_pcm_format (codec, dai, -params_format (params)); +adav80x_set_capture_pcm_format (codec, dai, params);adav80x_set_adc_clock (codec, rate); } adav80x->rate = rate;
Signature · 1 line
1.8.5.2
Quoted 1 line · Mark Brown
From: Mark Brown <[email protected]>
It would have been nice to have a least a small explanation why this is a better approach. It might not be immediately obvious to somebody reading the log later on.
Quoted 2 lines
Signed-off-by Mark Brown <[email protected]>
All five patches in this series
Thanks.
Quoted 30 lines
--- sound/soc/codecs/ad1836.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)sound/soc/codecs/ad1836.c +5
-5@@ -168,15 +168,15 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream,int word_len =0 ;/* bit size */ -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : word_len =AD1836_WORD_LEN_16 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : word_len =AD1836_WORD_LEN_20 ;break ; -case SNDRV_PCM_FORMAT_S24_LE : -case SNDRV_PCM_FORMAT_S32_LE : +case 24 : +case 32 : word_len =AD1836_WORD_LEN_24 ;break ;default :
Mark Brown
maintainerQuoted 6 lines · Lars-Peter Clausen
Quoted 1 line · Mark Brown
From: Mark Brown <[email protected]>
It would have been nice to have a least a small explanation why this is a better approach. It might not be immediately obvious to somebody reading the log later on.
OTOH it does get rather tiresome with repetitive changes - even where there's some notes generally the thing to do is look at the patch implementing the new API to figure out why it's better (not that this is much help here yet).