ASoC: cs42l73: Don't mix SNDRV_PCM_RATE_KNOT with specific rates

SNDRV_PCM_RATE_KNOT means that the device can support rates that can not be
expressed using the rate bits. The driver will provide a list of those rates
specified through constraints. Any rate bits that are set in the rates mask will
be ignored. So setting other rate bits besides SNDRV_PCM_RATE_KNOT wont have any
effect, but might be confusing to the casual reader, so remove them.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 549d5d6a3fef47f0680934c68b36a2c6a48529d0..7cae046c7dd0174ef36e68e5b18b33b78b0ab23a 100644 (file)
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1255,9 +1255,6 @@ static int cs42l73_pcm_startup(struct snd_pcm_substream *substream,
        return 0;
 }
 
-/* SNDRV_PCM_RATE_KNOT -> 12000, 24000 Hz, limit with constraint list */
-#define CS42L73_RATES (SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_KNOT)
-
 
 #define CS42L73_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
        SNDRV_PCM_FMTBIT_S24_LE)
@@ -1278,14 +1275,14 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
                        .stream_name = "XSP Playback",
                        .channels_min = 1,
                        .channels_max = 2,
-                       .rates = CS42L73_RATES,
+                       .rates = SNDRV_PCM_RATE_KNOT,
                        .formats = CS42L73_FORMATS,
                },
                .capture = {
                        .stream_name = "XSP Capture",
                        .channels_min = 1,
                        .channels_max = 2,
-                       .rates = CS42L73_RATES,
+                       .rates = SNDRV_PCM_RATE_KNOT,
                        .formats = CS42L73_FORMATS,
                },
                .ops = &cs42l73_ops,
@@ -1298,14 +1295,14 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
                        .stream_name = "ASP Playback",
                        .channels_min = 2,
                        .channels_max = 2,
-                       .rates = CS42L73_RATES,
+                       .rates = SNDRV_PCM_RATE_KNOT,
                        .formats = CS42L73_FORMATS,
                },
                .capture = {
                        .stream_name = "ASP Capture",
                        .channels_min = 2,
                        .channels_max = 2,
-                       .rates = CS42L73_RATES,
+                       .rates = SNDRV_PCM_RATE_KNOT,
                        .formats = CS42L73_FORMATS,
                },
                .ops = &cs42l73_ops,
@@ -1318,14 +1315,14 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
                        .stream_name = "VSP Playback",
                        .channels_min = 1,
                        .channels_max = 2,
-                       .rates = CS42L73_RATES,
+                       .rates = SNDRV_PCM_RATE_KNOT,
                        .formats = CS42L73_FORMATS,
                },
                .capture = {
                        .stream_name = "VSP Capture",
                        .channels_min = 1,
                        .channels_max = 2,
-                       .rates = CS42L73_RATES,
+                       .rates = SNDRV_PCM_RATE_KNOT,
                        .formats = CS42L73_FORMATS,
                },
                .ops = &cs42l73_ops,