ASoC: multi-component - ASoC Multi-Component Support

[mv-sheeva.git] / sound / soc / nuc900 / nuc900-pcm.c

diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c
index 445a18011d8ea3cdd4f0eee3c5580f87e6e70321..195d1ac94771808c0eda8075255efff787cdfd59 100644 (file)
--- a/sound/soc/nuc900/nuc900-pcm.c
+++ b/sound/soc/nuc900/nuc900-pcm.c
@@ -23,7 +23,7 @@
 
 #include <mach/hardware.h>
 
-#include "nuc900-auido.h"
+#include "nuc900-audio.h"
 
 static const struct snd_pcm_hardware nuc900_pcm_hardware = {
        .info                   = SNDRV_PCM_INFO_INTERLEAVED |
@@ -328,26 +328,44 @@ static int nuc900_dma_new(struct snd_card *card,
        return 0;
 }
 
-struct snd_soc_platform nuc900_soc_platform = {
-       .name           = "nuc900-dma",
-       .pcm_ops        = &nuc900_dma_ops,
+static struct snd_soc_platform_driver nuc900_soc_platform = {
+       .ops            = &nuc900_dma_ops,
        .pcm_new        = nuc900_dma_new,
        .pcm_free       = nuc900_dma_free_dma_buffers,
 }
-EXPORT_SYMBOL_GPL(nuc900_soc_platform);
 
-static int __init nuc900_soc_platform_init(void)
+static int __devinit nuc900_soc_platform_probe(struct platform_device *pdev)
 {
-       return snd_soc_register_platform(&nuc900_soc_platform);
+       return snd_soc_register_platform(&pdev->dev, &nuc900_soc_platform);
 }
 
-static void __exit nuc900_soc_platform_exit(void)
+static int __devexit nuc900_soc_platform_remove(struct platform_device *pdev)
 {
-       snd_soc_unregister_platform(&nuc900_soc_platform);
+       snd_soc_unregister_platform(&pdev->dev);
+       return 0;
 }
 
-module_init(nuc900_soc_platform_init);
-module_exit(nuc900_soc_platform_exit);
+static struct platform_driver nuc900_pcm_driver = {
+       .driver = {
+                       .name = "nuc900-pcm-audio",
+                       .owner = THIS_MODULE,
+       },
+
+       .probe = nuc900_soc_platform_probe,
+       .remove = __devexit_p(nuc900_soc_platform_remove),
+};
+
+static int __init nuc900_pcm_init(void)
+{
+       return platform_driver_register(&nuc900_pcm_driver);
+}
+module_init(nuc900_pcm_init);
+
+static void __exit nuc900_pcm_exit(void)
+{
+       platform_driver_unregister(&nuc900_pcm_driver);
+}
+module_exit(nuc900_pcm_exit);
 
 MODULE_AUTHOR("Wan ZongShun, <mcuos.com@gmail.com>");
 MODULE_DESCRIPTION("nuc900 Audio DMA module");