1 files changed, 10 insertions, 96 deletions

diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c
index 9d1df2628136..748808285119 100644
--- a/sound/soc/codecs/wm8727.c
+++ b/sound/soc/codecs/wm8727.c
@@ -23,7 +23,6 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include "wm8727.h"
 /*
  * Note this is a simple chip with no configuration interface, sample rate is
  * determined automatically by examining the Master clock and Bit clock ratios
@@ -33,8 +32,8 @@
                         SNDRV_PCM_RATE_192000)
 
 
-struct snd_soc_dai wm8727_dai = {
-        .name = "WM8727",
+static struct snd_soc_dai_driver wm8727_dai = {
+        .name = "wm8727-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
@@ -43,103 +42,18 @@ struct snd_soc_dai wm8727_dai = {
                 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,
                 },
 };
-EXPORT_SYMBOL_GPL(wm8727_dai);
 
-static struct snd_soc_codec *wm8727_codec;
+static struct snd_soc_codec_driver soc_codec_dev_wm8727;
 
-static int wm8727_soc_probe(struct platform_device *pdev)
+static __devinit int wm8727_probe(struct platform_device *pdev)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        int ret = 0;
-
-        BUG_ON(!wm8727_codec);
-
-        socdev->card->codec = wm8727_codec;
-
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8727: failed to create pcms\n");
-                goto pcm_err;
-        }
-
-        return ret;
-
-pcm_err:
-        kfree(socdev->card->codec);
-        socdev->card->codec = NULL;
-        return ret;
-}
-
-static int wm8727_soc_remove(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-
-        snd_soc_free_pcms(socdev);
-
-        return 0;
-}
-
-struct snd_soc_codec_device soc_codec_dev_wm8727 = {
-        .probe =        wm8727_soc_probe,
-        .remove =       wm8727_soc_remove,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8727);
-
-
-static __devinit int wm8727_platform_probe(struct platform_device *pdev)
-{
-        struct snd_soc_codec *codec;
-        int ret;
-
-        if (wm8727_codec) {
-                dev_err(&pdev->dev, "Another WM8727 is registered\n");
-                return -EBUSY;
-        }
-
-        codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-        if (codec == NULL)
-                return -ENOMEM;
-        wm8727_codec = codec;
-
-        platform_set_drvdata(pdev, codec);
-
-        mutex_init(&codec->mutex);
-        codec->dev = &pdev->dev;
-        codec->name = "WM8727";
-        codec->owner = THIS_MODULE;
-        codec->dai = &wm8727_dai;
-        codec->num_dai = 1;
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-
-        wm8727_dai.dev = &pdev->dev;
-
-        ret = snd_soc_register_codec(codec);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "Failed to register CODEC: %d\n", ret);
-                goto err;
-        }
-
-        ret = snd_soc_register_dai(&wm8727_dai);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "Failed to register DAI: %d\n", ret);
-                goto err_codec;
-        }
-
-        return 0;
-
-err_codec:
-        snd_soc_unregister_codec(codec);
-err:
-        kfree(codec);
-        return ret;
+        return snd_soc_register_codec(&pdev->dev,
+                        &soc_codec_dev_wm8727, &wm8727_dai, 1);
 }
 
-static int __devexit wm8727_platform_remove(struct platform_device *pdev)
+static int __devexit wm8727_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&wm8727_dai);
-        snd_soc_unregister_codec(platform_get_drvdata(pdev));
+        snd_soc_unregister_codec(&pdev->dev);
         return 0;
 }
 
@@ -149,8 +63,8 @@ static struct platform_driver wm8727_codec_driver = {
                         .owner = THIS_MODULE,
         },
 
-        .probe = wm8727_platform_probe,
-        .remove = __devexit_p(wm8727_platform_remove),
+        .probe = wm8727_probe,
+        .remove = __devexit_p(wm8727_remove),
 };
 
 static int __init wm8727_init(void)