diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-01-11 10:24:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-14 20:42:34 +0000 |
| commit | 55dcdb5051930dee75e9e2c0da90bc82ee3dcd77 (patch) | |
| tree | e05838d0923ffce632897b46954468349a661c7a | |
| parent | e3a9269f874067fcefc5eb8037466161fb0fe3f4 (diff) | |
| download | op-kernel-dev-55dcdb5051930dee75e9e2c0da90bc82ee3dcd77.zip op-kernel-dev-55dcdb5051930dee75e9e2c0da90bc82ee3dcd77.tar.gz | |
ASoC: pcm: Use snd_pcm_rate_mask_intersect() helper
Instead of open-coding the intersecting of two rate masks (and getting slightly
wrong for some of the corner cases) use the new snd_pcm_rate_mask_intersect()
helper function.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/soc-pcm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2b89496..4bbda0a 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -162,13 +162,8 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_runtime *runtime, hw->formats &= codec_stream->formats & cpu_stream->formats; else hw->formats = codec_stream->formats & cpu_stream->formats; - hw->rates = codec_stream->rates & cpu_stream->rates; - if (codec_stream->rates - & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS)) - hw->rates |= cpu_stream->rates; - if (cpu_stream->rates - & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS)) - hw->rates |= codec_stream->rates; + hw->rates = snd_pcm_rate_mask_intersect(codec_stream->rates, + cpu_stream->rates); hw->rate_min = 0; hw->rate_max = UINT_MAX; |
