1 files changed, 23 insertions, 42 deletions

diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index 0019c59a77..dd9aa51d8c 100644
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -1,6 +1,6 @@
 /*
  *  PCM Interface - misc routines
- *  Copyright (c) 1998 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1998 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -422,38 +422,6 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int
 
 EXPORT_SYMBOL(snd_pcm_format_set_silence);
 
-/* [width][unsigned][bigendian] */
-static int linear_formats[4][2][2] = {
-        {{ SNDRV_PCM_FORMAT_S8, SNDRV_PCM_FORMAT_S8},
-         { SNDRV_PCM_FORMAT_U8, SNDRV_PCM_FORMAT_U8}},
-        {{SNDRV_PCM_FORMAT_S16_LE, SNDRV_PCM_FORMAT_S16_BE},
-         {SNDRV_PCM_FORMAT_U16_LE, SNDRV_PCM_FORMAT_U16_BE}},
-        {{SNDRV_PCM_FORMAT_S24_LE, SNDRV_PCM_FORMAT_S24_BE},
-         {SNDRV_PCM_FORMAT_U24_LE, SNDRV_PCM_FORMAT_U24_BE}},
-        {{SNDRV_PCM_FORMAT_S32_LE, SNDRV_PCM_FORMAT_S32_BE},
-         {SNDRV_PCM_FORMAT_U32_LE, SNDRV_PCM_FORMAT_U32_BE}}
-};
-
-/**
- * snd_pcm_build_linear_format - return the suitable linear format for the given condition
- * @width: the bit-width
- * @unsignd: 1 if unsigned, 0 if signed.
- * @big_endian: 1 if big-endian, 0 if little-endian
- *
- * Returns the suitable linear format for the given condition.
- */
-snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian)
-{
-        if (width & 7)
-                return SND_PCM_FORMAT_UNKNOWN;
-        width = (width / 8) - 1;
-        if (width < 0 || width >= 4)
-                return SND_PCM_FORMAT_UNKNOWN;
-        return linear_formats[width][!!unsignd][!!big_endian];
-}
-
-EXPORT_SYMBOL(snd_pcm_build_linear_format);
-
 /**
  * snd_pcm_limit_hw_rates - determine rate_min/rate_max fields
  * @runtime: the runtime instance
@@ -465,21 +433,16 @@ EXPORT_SYMBOL(snd_pcm_build_linear_format);
  */
 int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)
 {
-        static unsigned rates[] = {
-                /* ATTENTION: these values depend on the definition in pcm.h! */
-                5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000,
-                64000, 88200, 96000, 176400, 192000
-        };
         int i;
-        for (i = 0; i < (int)ARRAY_SIZE(rates); i++) {
+        for (i = 0; i < (int)snd_pcm_known_rates.count; i++) {
                 if (runtime->hw.rates & (1 << i)) {
-                        runtime->hw.rate_min = rates[i];
+                        runtime->hw.rate_min = snd_pcm_known_rates.list[i];
                         break;
                 }
         }
-        for (i = (int)ARRAY_SIZE(rates) - 1; i >= 0; i--) {
+        for (i = (int)snd_pcm_known_rates.count - 1; i >= 0; i--) {
                 if (runtime->hw.rates & (1 << i)) {
-                        runtime->hw.rate_max = rates[i];
+                        runtime->hw.rate_max = snd_pcm_known_rates.list[i];
                         break;
                 }
         }
@@ -487,3 +450,21 @@ int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)
 }
 
 EXPORT_SYMBOL(snd_pcm_limit_hw_rates);
+
+/**
+ * snd_pcm_rate_to_rate_bit - converts sample rate to SNDRV_PCM_RATE_xxx bit
+ * @rate: the sample rate to convert
+ *
+ * Returns the SNDRV_PCM_RATE_xxx flag that corresponds to the given rate, or
+ * SNDRV_PCM_RATE_KNOT for an unknown rate.
+ */
+unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate)
+{
+        unsigned int i;
+
+        for (i = 0; i < snd_pcm_known_rates.count; i++)
+                if (snd_pcm_known_rates.list[i] == rate)
+                        return 1u << i;
+        return SNDRV_PCM_RATE_KNOT;
+}
+EXPORT_SYMBOL(snd_pcm_rate_to_rate_bit);