Skip to content

Commit

Permalink
ASoC: wm8994: Convert to params_width()
Browse files Browse the repository at this point in the history
The CODEC doesn't care how data is laid out in memory.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Jul 31, 2014
1 parent ae62ba6 commit e29fe49
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions sound/soc/codecs/wm8994.c
Original file line number Diff line number Diff line change
Expand Up @@ -2815,19 +2815,19 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
}

bclk_rate = params_rate(params);
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
switch (params_width(params)) {
case 16:
bclk_rate *= 16;
break;
case SNDRV_PCM_FORMAT_S20_3LE:
case 20:
bclk_rate *= 20;
aif1 |= 0x20;
break;
case SNDRV_PCM_FORMAT_S24_LE:
case 24:
bclk_rate *= 24;
aif1 |= 0x40;
break;
case SNDRV_PCM_FORMAT_S32_LE:
case 32:
bclk_rate *= 32;
aif1 |= 0x60;
break;
Expand Down Expand Up @@ -2966,16 +2966,16 @@ static int wm8994_aif3_hw_params(struct snd_pcm_substream *substream,
return 0;
}

switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
switch (params_width(params)) {
case 16:
break;
case SNDRV_PCM_FORMAT_S20_3LE:
case 20:
aif1 |= 0x20;
break;
case SNDRV_PCM_FORMAT_S24_LE:
case 24:
aif1 |= 0x40;
break;
case SNDRV_PCM_FORMAT_S32_LE:
case 32:
aif1 |= 0x60;
break;
default:
Expand Down

0 comments on commit e29fe49

Please sign in to comment.