4 files changed, 50 insertions, 46 deletions

diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index caa7c901bc2e..dac6732da969 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -20,7 +20,6 @@
 #include <sound/pcm.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
-#include <linux/device.h>
 #include <linux/clk.h>
 
 #include <mach/mfp.h>
@@ -50,7 +49,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,
         mutex_lock(&ac97_mutex);
 
         val = nuc900_checkready();
-        if (!!val) {
+        if (val) {
                 dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
                 goto out;
         }
@@ -103,7 +102,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
         mutex_lock(&ac97_mutex);
 
         tmp = nuc900_checkready();
-        if (!!tmp)
+        if (tmp)
                 dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
 
         /* clear the R_WB bit and write register index */
@@ -150,7 +149,7 @@ static void nuc900_ac97_warm_reset(struct snd_ac97 *ac97)
         udelay(100);
 
         val = nuc900_checkready();
-        if (!!val)
+        if (val)
                 dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
 
         mutex_unlock(&ac97_mutex);
@@ -264,8 +263,7 @@ static int nuc900_ac97_trigger(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static int nuc900_ac97_probe(struct platform_device *pdev,
-                                        struct snd_soc_dai *dai)
+static int nuc900_ac97_probe(struct snd_soc_dai *dai)
 {
         struct nuc900_audio *nuc900_audio = nuc900_ac97_data;
         unsigned long val;
@@ -285,20 +283,19 @@ static int nuc900_ac97_probe(struct platform_device *pdev,
         return 0;
 }
 
-static void nuc900_ac97_remove(struct platform_device *pdev,
-                                                struct snd_soc_dai *dai)
+static int nuc900_ac97_remove(struct snd_soc_dai *dai)
 {
         struct nuc900_audio *nuc900_audio = nuc900_ac97_data;
 
         clk_disable(nuc900_audio->clk);
+        return 0;
 }
 
 static struct snd_soc_dai_ops nuc900_ac97_dai_ops = {
         .trigger        = nuc900_ac97_trigger,
 };
 
-struct snd_soc_dai nuc900_ac97_dai = {
-        .name                   = "nuc900-ac97",
+static struct snd_soc_dai_driver nuc900_ac97_dai = {
         .probe                  = nuc900_ac97_probe,
         .remove                 = nuc900_ac97_remove,
         .ac97_control           = 1,
@@ -315,8 +312,7 @@ struct snd_soc_dai nuc900_ac97_dai = {
                 .channels_max   = 2,
         },
         .ops = &nuc900_ac97_dai_ops,
-}
-EXPORT_SYMBOL_GPL(nuc900_ac97_dai);
+};
 
 static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
 {
@@ -365,9 +361,7 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
 
         nuc900_ac97_data = nuc900_audio;
 
-        nuc900_audio->dev = nuc900_ac97_dai.dev =  &pdev->dev;
-
-        ret = snd_soc_register_dai(&nuc900_ac97_dai);
+        ret = snd_soc_register_dai(&pdev->dev, &nuc900_ac97_dai);
         if (ret)
                 goto out3;
 
@@ -389,14 +383,14 @@ out0:
 
 static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev)
 {
-
-        snd_soc_unregister_dai(&nuc900_ac97_dai);
+        snd_soc_unregister_dai(&pdev->dev);
 
         clk_put(nuc900_ac97_data->clk);
         iounmap(nuc900_ac97_data->mmio);
         release_mem_region(nuc900_ac97_data->res->start,
                                 resource_size(nuc900_ac97_data->res));
 
+        kfree(nuc900_ac97_data);
         nuc900_ac97_data = NULL;
 
         return 0;
@@ -404,7 +398,7 @@ static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev)
 
 static struct platform_driver nuc900_ac97_driver = {
         .driver = {
-                .name   = "nuc900-audio",
+                .name   = "nuc900-ac97",
                 .owner  = THIS_MODULE,
         },
         .probe          = nuc900_ac97_drvprobe,
diff --git a/sound/soc/nuc900/nuc900-audio.c b/sound/soc/nuc900/nuc900-audio.c
index 72e6f518f7b2..38a2d0d883b5 100644
--- a/sound/soc/nuc900/nuc900-audio.c
+++ b/sound/soc/nuc900/nuc900-audio.c
@@ -18,28 +18,22 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
-#include "../codecs/ac97.h"
 #include "nuc900-audio.h"
 
 static struct snd_soc_dai_link nuc900evb_ac97_dai = {
         .name           = "AC97",
         .stream_name    = "AC97 HiFi",
-        .cpu_dai        = &nuc900_ac97_dai,
-        .codec_dai      = &ac97_dai,
+        .cpu_dai_name   = "nuc900-ac97",
+        .codec_dai_name = "ac97-hifi",
+        .codec_name     = "ac97-codec",
+        .platform_name  = "nuc900-pcm-audio",
 };
 
 static struct snd_soc_card nuc900evb_audio_machine = {
         .name           = "NUC900EVB_AC97",
         .dai_link       = &nuc900evb_ac97_dai,
         .num_links      = 1,
-        .platform       = &nuc900_soc_platform,
-};
-
-static struct snd_soc_device nuc900evb_ac97_devdata = {
-        .card           = &nuc900evb_audio_machine,
-        .codec_dev      = &soc_codec_dev_ac97,
 };
 
 static struct platform_device *nuc900evb_asoc_dev;
@@ -54,9 +48,8 @@ static int __init nuc900evb_audio_init(void)
                 goto out;
 
         /* nuc900 board audio device */
-        platform_set_drvdata(nuc900evb_asoc_dev, &nuc900evb_ac97_devdata);
+        platform_set_drvdata(nuc900evb_asoc_dev, &nuc900evb_audio_machine);
 
-        nuc900evb_ac97_devdata.dev = &nuc900evb_asoc_dev->dev;
         ret = platform_device_add(nuc900evb_asoc_dev);
 
         if (ret) {
diff --git a/sound/soc/nuc900/nuc900-audio.h b/sound/soc/nuc900/nuc900-audio.h
index 3038f519729f..59f7e8ed1a68 100644
--- a/sound/soc/nuc900/nuc900-audio.h
+++ b/sound/soc/nuc900/nuc900-audio.h
@@ -111,7 +111,5 @@ struct nuc900_audio {
 };
 
 extern struct nuc900_audio *nuc900_ac97_data;
-extern struct snd_soc_dai nuc900_ac97_dai;
-extern struct snd_soc_platform nuc900_soc_platform;
 
 #endif /*end _NUC900_AUDIO_H */
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c
index e81e803b3a63..8263f56dc665 100644
--- a/sound/soc/nuc900/nuc900-pcm.c
+++ b/sound/soc/nuc900/nuc900-pcm.c
@@ -50,12 +50,12 @@ static int nuc900_dma_hw_params(struct snd_pcm_substream *substream,
         unsigned long flags;
         int ret = 0;
 
-        spin_lock_irqsave(&nuc900_audio->lock, flags);
-
         ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
         if (ret < 0)
                 return ret;
 
+        spin_lock_irqsave(&nuc900_audio->lock, flags);
+
         nuc900_audio->substream = substream;
         nuc900_audio->dma_addr[substream->stream] = runtime->dma_addr;
         nuc900_audio->buffersize[substream->stream] =
@@ -169,6 +169,7 @@ static int nuc900_dma_prepare(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct nuc900_audio *nuc900_audio = runtime->private_data;
         unsigned long flags, val;
+        int ret = 0;
 
         spin_lock_irqsave(&nuc900_audio->lock, flags);
 
@@ -197,10 +198,10 @@ static int nuc900_dma_prepare(struct snd_pcm_substream *substream)
                 AUDIO_WRITE(nuc900_audio->mmio + ACTL_RESET, val);
                 break;
         default:
-                return -EINVAL;
+                ret = -EINVAL;
         }
         spin_unlock_irqrestore(&nuc900_audio->lock, flags);
-        return 0;
+        return ret;
 }
 
 static int nuc900_dma_trigger(struct snd_pcm_substream *substream, int cmd)
@@ -328,26 +329,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,
+};
+
+static int __devinit nuc900_soc_platform_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_platform(&pdev->dev, &nuc900_soc_platform);
 }
-EXPORT_SYMBOL_GPL(nuc900_soc_platform);
 
-static int __init nuc900_soc_platform_init(void)
+static int __devexit nuc900_soc_platform_remove(struct platform_device *pdev)
 {
-        return snd_soc_register_platform(&nuc900_soc_platform);
+        snd_soc_unregister_platform(&pdev->dev);
+        return 0;
 }
 
-static void __exit nuc900_soc_platform_exit(void)
+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)
 {
-        snd_soc_unregister_platform(&nuc900_soc_platform);
+        return platform_driver_register(&nuc900_pcm_driver);
 }
+module_init(nuc900_pcm_init);
 
-module_init(nuc900_soc_platform_init);
-module_exit(nuc900_soc_platform_exit);
+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");