ASoC: Declare const properly for enum texts

[pandora-kernel.git] / sound / soc / soc-utils.c

diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 1d07b93..ec921ec 100644 (file)
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -13,6 +13,7 @@
  *  option) any later version.
  */
 
+#include <linux/platform_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -28,26 +29,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);
@@ -72,3 +56,55 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *params)
                return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk);
+
+static struct snd_soc_platform_driver dummy_platform;
+
+static __devinit int snd_soc_dummy_probe(struct platform_device *pdev)
+{
+       return snd_soc_register_platform(&pdev->dev, &dummy_platform);
+}
+
+static __devexit int snd_soc_dummy_remove(struct platform_device *pdev)
+{
+       snd_soc_unregister_platform(&pdev->dev);
+
+       return 0;
+}
+
+static struct platform_driver soc_dummy_driver = {
+       .driver = {
+               .name = "snd-soc-dummy",
+               .owner = THIS_MODULE,
+       },
+       .probe = snd_soc_dummy_probe,
+       .remove = __devexit_p(snd_soc_dummy_remove),
+};
+
+static struct platform_device *soc_dummy_dev;
+
+int __init snd_soc_util_init(void)
+{
+       int ret;
+
+       soc_dummy_dev = platform_device_alloc("snd-soc-dummy", -1);
+       if (!soc_dummy_dev)
+               return -ENOMEM;
+
+       ret = platform_device_add(soc_dummy_dev);
+       if (ret != 0) {
+               platform_device_put(soc_dummy_dev);
+               return ret;
+       }
+
+       ret = platform_driver_register(&soc_dummy_driver);
+       if (ret != 0)
+               platform_device_unregister(soc_dummy_dev);
+
+       return ret;
+}
+
+void __exit snd_soc_util_exit(void)
+{
+       platform_device_unregister(soc_dummy_dev);
+       platform_driver_unregister(&soc_dummy_driver);
+}