1 files changed, 55 insertions, 147 deletions

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index e2dba07f0260..f8d9c60e7fad 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -31,11 +31,9 @@
 
 #include "wm8711.h"
 
-static struct snd_soc_codec *wm8711_codec;
-
 /* codec private data */
 struct wm8711_priv {
-        struct snd_soc_codec codec;
+        enum snd_soc_control_type bus_type;
         u16 reg_cache[WM8711_CACHEREGNUM];
         unsigned int sysclk;
 };
@@ -163,7 +161,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
-        struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
+        struct wm8711_priv *wm8711 =  snd_soc_codec_get_drvdata(codec);
         u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc;
         int i = get_coeff(wm8711->sysclk, params_rate(params));
         u16 srate = (coeff_div[i].sr << 2) |
@@ -227,7 +225,7 @@ static int wm8711_set_dai_sysclk(struct snd_soc_dai *codec_dai,
                 int clk_id, unsigned int freq, int dir)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
-        struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
+        struct wm8711_priv *wm8711 =  snd_soc_codec_get_drvdata(codec);
 
         switch (freq) {
         case 11289600:
@@ -338,8 +336,8 @@ static struct snd_soc_dai_ops wm8711_ops = {
         .set_fmt = wm8711_set_dai_fmt,
 };
 
-struct snd_soc_dai wm8711_dai = {
-        .name = "WM8711",
+static struct snd_soc_dai_driver wm8711_dai = {
+        .name = "wm8711-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
@@ -349,22 +347,16 @@ struct snd_soc_dai wm8711_dai = {
         },
         .ops = &wm8711_ops,
 };
-EXPORT_SYMBOL_GPL(wm8711_dai);
 
-static int wm8711_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8711_suspend(struct snd_soc_codec *codec, pm_message_t state)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
-
         snd_soc_write(codec, WM8711_ACTIVE, 0x0);
         wm8711_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
-static int wm8711_resume(struct platform_device *pdev)
+static int wm8711_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
         int i;
         u8 data[2];
         u16 *cache = codec->reg_cache;
@@ -380,99 +372,23 @@ static int wm8711_resume(struct platform_device *pdev)
         return 0;
 }
 
-static int wm8711_probe(struct platform_device *pdev)
+static int wm8711_probe(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
-        int ret = 0;
-
-        if (wm8711_codec == NULL) {
-                dev_err(&pdev->dev, "Codec device not registered\n");
-                return -ENODEV;
-        }
-
-        socdev->card->codec = wm8711_codec;
-        codec = wm8711_codec;
-
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to create pcms: %d\n", ret);
-                goto pcm_err;
-        }
-
-        snd_soc_add_controls(codec, wm8711_snd_controls,
-                             ARRAY_SIZE(wm8711_snd_controls));
-        wm8711_add_widgets(codec);
-
-        return ret;
-
-pcm_err:
-        return ret;
-}
-
-/* power down chip */
-static int wm8711_remove(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-
-        return 0;
-}
-
-struct snd_soc_codec_device soc_codec_dev_wm8711 = {
-        .probe =        wm8711_probe,
-        .remove =       wm8711_remove,
-        .suspend =      wm8711_suspend,
-        .resume =       wm8711_resume,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8711);
-
-static int wm8711_register(struct wm8711_priv *wm8711,
-                           enum snd_soc_control_type control)
-{
-        int ret;
-        struct snd_soc_codec *codec = &wm8711->codec;
-        u16 reg;
-
-        if (wm8711_codec) {
-                dev_err(codec->dev, "Another WM8711 is registered\n");
-                ret = -EINVAL;
-                goto err;
-        }
-
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-
-        snd_soc_codec_set_drvdata(codec, wm8711);
-        codec->name = "WM8711";
-        codec->owner = THIS_MODULE;
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        codec->set_bias_level = wm8711_set_bias_level;
-        codec->dai = &wm8711_dai;
-        codec->num_dai = 1;
-        codec->reg_cache_size = WM8711_CACHEREGNUM;
-        codec->reg_cache = &wm8711->reg_cache;
-
-        memcpy(codec->reg_cache, wm8711_reg, sizeof(wm8711_reg));
+        struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
+        int ret, reg;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, control);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-                goto err;
+                return ret;
         }
 
         ret = wm8711_reset(codec);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to issue reset\n");
-                goto err;
+                return ret;
         }
 
-        wm8711_dai.dev = codec->dev;
-
         wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Latch the update bits */
@@ -481,69 +397,62 @@ static int wm8711_register(struct wm8711_priv *wm8711,
         reg = snd_soc_read(codec, WM8711_ROUT1V);
         snd_soc_write(codec, WM8711_ROUT1V, reg | 0x0100);
 
-        wm8711_codec = codec;
-
-        ret = snd_soc_register_codec(codec);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-                goto err;
-        }
-
-        ret = snd_soc_register_dai(&wm8711_dai);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
-                goto err_codec;
-        }
-
-        return 0;
+        snd_soc_add_controls(codec, wm8711_snd_controls,
+                             ARRAY_SIZE(wm8711_snd_controls));
+        wm8711_add_widgets(codec);
 
-err_codec:
-        snd_soc_unregister_codec(codec);
-err:
-        kfree(wm8711);
         return ret;
+
 }
 
-static void wm8711_unregister(struct wm8711_priv *wm8711)
+/* power down chip */
+static int wm8711_remove(struct snd_soc_codec *codec)
 {
-        wm8711_set_bias_level(&wm8711->codec, SND_SOC_BIAS_OFF);
-        snd_soc_unregister_dai(&wm8711_dai);
-        snd_soc_unregister_codec(&wm8711->codec);
-        kfree(wm8711);
-        wm8711_codec = NULL;
+        wm8711_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        return 0;
 }
 
+static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
+        .probe =        wm8711_probe,
+        .remove =       wm8711_remove,
+        .suspend =      wm8711_suspend,
+        .resume =       wm8711_resume,
+        .set_bias_level = wm8711_set_bias_level,
+        .reg_cache_size = sizeof(wm8711_reg),
+        .reg_word_size = sizeof(u16),
+        .reg_cache_default = wm8711_reg,
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8711_spi_probe(struct spi_device *spi)
 {
-        struct snd_soc_codec *codec;
         struct wm8711_priv *wm8711;
+        int ret;
 
         wm8711 = kzalloc(sizeof(struct wm8711_priv), GFP_KERNEL);
         if (wm8711 == NULL)
                 return -ENOMEM;
 
-        codec = &wm8711->codec;
-        codec->control_data = spi;
-        codec->dev = &spi->dev;
+        spi_set_drvdata(spi, wm8711);
+        wm8711->bus_type = SND_SOC_SPI;
 
-        dev_set_drvdata(&spi->dev, wm8711);
-
-        return wm8711_register(wm8711, SND_SOC_SPI);
+        ret = snd_soc_register_codec(&spi->dev,
+                        &soc_codec_dev_wm8711, &wm8711_dai, 1);
+        if (ret < 0)
+                kfree(wm8711);
+        return ret;
 }
 
 static int __devexit wm8711_spi_remove(struct spi_device *spi)
 {
-        struct wm8711_priv *wm8711 = dev_get_drvdata(&spi->dev);
-
-        wm8711_unregister(wm8711);
-
+        snd_soc_unregister_codec(&spi->dev);
+        kfree(spi_get_drvdata(spi));
         return 0;
 }
 
 static struct spi_driver wm8711_spi_driver = {
         .driver = {
-                .name   = "wm8711",
+                .name   = "wm8711-codec",
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
@@ -553,31 +462,30 @@ static struct spi_driver wm8711_spi_driver = {
 #endif /* CONFIG_SPI_MASTER */
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-static __devinit int wm8711_i2c_probe(struct i2c_client *i2c,
+static __devinit int wm8711_i2c_probe(struct i2c_client *client,
                                       const struct i2c_device_id *id)
 {
         struct wm8711_priv *wm8711;
-        struct snd_soc_codec *codec;
+        int ret;
 
         wm8711 = kzalloc(sizeof(struct wm8711_priv), GFP_KERNEL);
         if (wm8711 == NULL)
                 return -ENOMEM;
 
-        codec = &wm8711->codec;
-        codec->hw_write = (hw_write_t)i2c_master_send;
-
-        i2c_set_clientdata(i2c, wm8711);
-        codec->control_data = i2c;
+        i2c_set_clientdata(client, wm8711);
+        wm8711->bus_type = SND_SOC_I2C;
 
-        codec->dev = &i2c->dev;
-
-        return wm8711_register(wm8711, SND_SOC_I2C);
+        ret =  snd_soc_register_codec(&client->dev,
+                        &soc_codec_dev_wm8711, &wm8711_dai, 1);
+        if (ret < 0)
+                kfree(wm8711);
+        return ret;
 }
 
 static __devexit int wm8711_i2c_remove(struct i2c_client *client)
 {
-        struct wm8711_priv *wm8711 = i2c_get_clientdata(client);
-        wm8711_unregister(wm8711);
+        snd_soc_unregister_codec(&client->dev);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
@@ -589,7 +497,7 @@ MODULE_DEVICE_TABLE(i2c, wm8711_i2c_id);
 
 static struct i2c_driver wm8711_i2c_driver = {
         .driver = {
-                .name = "WM8711 I2C Codec",
+                .name = "wm8711-codec",
                 .owner = THIS_MODULE,
         },
         .probe =    wm8711_i2c_probe,