diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-31 20:14:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-01 14:31:40 +0000 |
| commit | 3d8b2ce01b2de7c3c5cbf18b9b97d26cfaf11c14 (patch) | |
| tree | 0ffbd9f409b9ea657a6d5139fa144f2d8c81cf2f /sound/soc/soc-utils.c | |
| parent | 2bc9a81e2aa3c95b1e709f3109c3bbc6d969cc06 (diff) | |
| download | renesas_kernel-3d8b2ce01b2de7c3c5cbf18b9b97d26cfaf11c14.tar.gz renesas_kernel-3d8b2ce01b2de7c3c5cbf18b9b97d26cfaf11c14.tar.bz2 renesas_kernel-3d8b2ce01b2de7c3c5cbf18b9b97d26cfaf11c14.zip | |
ASoC: Use snd_pcm_format_width() in snd_soc_params_to_frame_size()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-utils.c')
| -rw-r--r-- | sound/soc/soc-utils.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 1d07b931f3d..3f45e6a439b 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -28,26 +28,9 @@ int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params) { int sample_size; - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: - case SNDRV_PCM_FORMAT_S16_BE: - sample_size = 16; - break; - case SNDRV_PCM_FORMAT_S20_3LE: - case SNDRV_PCM_FORMAT_S20_3BE: - sample_size = 20; - break; - case SNDRV_PCM_FORMAT_S24_LE: - case SNDRV_PCM_FORMAT_S24_BE: - sample_size = 24; - break; - case SNDRV_PCM_FORMAT_S32_LE: - case SNDRV_PCM_FORMAT_S32_BE: - sample_size = 32; - break; - default: - return -ENOTSUPP; - } + sample_size = snd_pcm_format_width(params_format(params)); + if (sample_size < 0) + return sample_size; return snd_soc_calc_frame_size(sample_size, params_channels(params), 1); |