1 files changed, 98 insertions, 192 deletions

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 0f7bcb61071a..dbfa05d2cb92 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -31,8 +31,6 @@
 
 #define WM8510_VERSION "0.6"
 
-struct snd_soc_codec_device soc_codec_dev_wm8510;
-
 /*
  * wm8510 register cache
  * We can't read the WM8510 register space when we are
@@ -61,6 +59,12 @@ static const u16 wm8510_reg[WM8510_CACHEREGNUM] = {
 
 #define wm8510_reset(c) snd_soc_write(c, WM8510_RESET, 0)
 
+/* codec private data */
+struct wm8510_priv {
+        enum snd_soc_control_type control_type;
+        void *control_data;
+};
+
 static const char *wm8510_companding[] = { "Off", "NC", "u-law", "A-law" };
 static const char *wm8510_deemp[] = { "None", "32kHz", "44.1kHz", "48kHz" };
 static const char *wm8510_alc[] = { "ALC", "Limiter" };
@@ -403,8 +407,7 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->card->codec;
+        struct snd_soc_codec *codec = rtd->codec;
         u16 iface = snd_soc_read(codec, WM8510_IFACE) & 0x19f;
         u16 adn = snd_soc_read(codec, WM8510_ADD) & 0x1f1;
 
@@ -514,8 +517,8 @@ static struct snd_soc_dai_ops wm8510_dai_ops = {
         .set_pll        = wm8510_set_dai_pll,
 };
 
-struct snd_soc_dai wm8510_dai = {
-        .name = "WM8510 HiFi",
+static struct snd_soc_dai_driver wm8510_dai = {
+        .name = "wm8510-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
@@ -531,21 +534,15 @@ struct snd_soc_dai wm8510_dai = {
         .ops = &wm8510_dai_ops,
         .symmetric_rates = 1,
 };
-EXPORT_SYMBOL_GPL(wm8510_dai);
 
-static int wm8510_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8510_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;
-
         wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
-static int wm8510_resume(struct platform_device *pdev)
+static int wm8510_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;
@@ -561,43 +558,22 @@ static int wm8510_resume(struct platform_device *pdev)
         return 0;
 }
 
-/*
- * initialise the WM8510 driver
- * register the mixer and dsp interfaces with the kernel
- */
-static int wm8510_init(struct snd_soc_device *socdev,
-                       enum snd_soc_control_type control)
+static int wm8510_probe(struct snd_soc_codec *codec)
 {
-        struct snd_soc_codec *codec = socdev->card->codec;
-        int ret = 0;
-
-        codec->name = "WM8510";
-        codec->owner = THIS_MODULE;
-        codec->set_bias_level = wm8510_set_bias_level;
-        codec->dai = &wm8510_dai;
-        codec->num_dai = 1;
-        codec->reg_cache_size = ARRAY_SIZE(wm8510_reg);
-        codec->reg_cache = kmemdup(wm8510_reg, sizeof(wm8510_reg), GFP_KERNEL);
+        struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec);
+        int ret;
 
-        if (codec->reg_cache == NULL)
-                return -ENOMEM;
+        pr_info("WM8510 Audio Codec %s", WM8510_VERSION);
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, control);
+        codec->control_data = wm8510->control_data;
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9,  wm8510->control_type);
         if (ret < 0) {
-                printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n",
-                       ret);
-                goto err;
+                printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", ret);
+                return ret;
         }
 
         wm8510_reset(codec);
 
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8510: failed to create pcms\n");
-                goto err;
-        }
-
         /* power on device */
         codec->bias_level = SND_SOC_BIAS_OFF;
         wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -606,119 +582,53 @@ static int wm8510_init(struct snd_soc_device *socdev,
         wm8510_add_widgets(codec);
 
         return ret;
-
-err:
-        kfree(codec->reg_cache);
-        return ret;
 }
 
-static struct snd_soc_device *wm8510_socdev;
-
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-
-/*
- * WM8510 2 wire address is 0x1a
- */
-
-static int wm8510_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+/* power down chip */
+static int wm8510_remove(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = wm8510_socdev;
-        struct snd_soc_codec *codec = socdev->card->codec;
-        int ret;
-
-        i2c_set_clientdata(i2c, codec);
-        codec->control_data = i2c;
-
-        ret = wm8510_init(socdev, SND_SOC_I2C);
-        if (ret < 0)
-                pr_err("failed to initialise WM8510\n");
-
-        return ret;
-}
+        struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec);
 
-static int wm8510_i2c_remove(struct i2c_client *client)
-{
-        struct snd_soc_codec *codec = i2c_get_clientdata(client);
-        kfree(codec->reg_cache);
+        wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        kfree(wm8510);
         return 0;
 }
 
-static const struct i2c_device_id wm8510_i2c_id[] = {
-        { "wm8510", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, wm8510_i2c_id);
-
-static struct i2c_driver wm8510_i2c_driver = {
-        .driver = {
-                .name = "WM8510 I2C Codec",
-                .owner = THIS_MODULE,
-        },
-        .probe =    wm8510_i2c_probe,
-        .remove =   wm8510_i2c_remove,
-        .id_table = wm8510_i2c_id,
+static struct snd_soc_codec_driver soc_codec_dev_wm8510 = {
+        .probe =        wm8510_probe,
+        .remove =       wm8510_remove,
+        .suspend =      wm8510_suspend,
+        .resume =       wm8510_resume,
+        .set_bias_level = wm8510_set_bias_level,
+        .reg_cache_size = ARRAY_SIZE(wm8510_reg),
+        .reg_word_size = sizeof(u16),
+        .reg_cache_default =wm8510_reg,
 };
 
-static int wm8510_add_i2c_device(struct platform_device *pdev,
-                                 const struct wm8510_setup_data *setup)
-{
-        struct i2c_board_info info;
-        struct i2c_adapter *adapter;
-        struct i2c_client *client;
-        int ret;
-
-        ret = i2c_add_driver(&wm8510_i2c_driver);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "can't add i2c driver\n");
-                return ret;
-        }
-
-        memset(&info, 0, sizeof(struct i2c_board_info));
-        info.addr = setup->i2c_address;
-        strlcpy(info.type, "wm8510", I2C_NAME_SIZE);
-
-        adapter = i2c_get_adapter(setup->i2c_bus);
-        if (!adapter) {
-                dev_err(&pdev->dev, "can't get i2c adapter %d\n",
-                        setup->i2c_bus);
-                goto err_driver;
-        }
-
-        client = i2c_new_device(adapter, &info);
-        i2c_put_adapter(adapter);
-        if (!client) {
-                dev_err(&pdev->dev, "can't add i2c device at 0x%x\n",
-                        (unsigned int)info.addr);
-                goto err_driver;
-        }
-
-        return 0;
-
-err_driver:
-        i2c_del_driver(&wm8510_i2c_driver);
-        return -ENODEV;
-}
-#endif
-
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8510_spi_probe(struct spi_device *spi)
 {
-        struct snd_soc_device *socdev = wm8510_socdev;
-        struct snd_soc_codec *codec = socdev->card->codec;
+        struct wm8510_priv *wm8510;
         int ret;
 
-        codec->control_data = spi;
+        wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
+        if (wm8510 == NULL)
+                return -ENOMEM;
+
+        wm8510->control_data = spi;
+        wm8510->control_type = SND_SOC_SPI;
+        spi_set_drvdata(spi, wm8510);
 
-        ret = wm8510_init(socdev, SND_SOC_SPI);
+        ret = snd_soc_register_codec(&spi->dev,
+                        &soc_codec_dev_wm8510, &wm8510_dai, 1);
         if (ret < 0)
-                dev_err(&spi->dev, "failed to initialise WM8510\n");
-
+                kfree(wm8510);
         return ret;
 }
 
 static int __devexit wm8510_spi_remove(struct spi_device *spi)
 {
+        snd_soc_unregister_codec(&spi->dev);
         return 0;
 }
 
@@ -733,84 +643,80 @@ static struct spi_driver wm8510_spi_driver = {
 };
 #endif /* CONFIG_SPI_MASTER */
 
-static int wm8510_probe(struct platform_device *pdev)
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+static __devinit int wm8510_i2c_probe(struct i2c_client *i2c,
+                                      const struct i2c_device_id *id)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct wm8510_setup_data *setup;
-        struct snd_soc_codec *codec;
-        int ret = 0;
-
-        pr_info("WM8510 Audio Codec %s", WM8510_VERSION);
+        struct wm8510_priv *wm8510;
+        int ret;
 
-        setup = socdev->codec_data;
-        codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-        if (codec == NULL)
+        wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
+        if (wm8510 == NULL)
                 return -ENOMEM;
 
-        socdev->card->codec = codec;
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
+        i2c_set_clientdata(i2c, wm8510);
+        wm8510->control_data = i2c;
+        wm8510->control_type = SND_SOC_I2C;
 
-        wm8510_socdev = socdev;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        if (setup->i2c_address) {
-                ret = wm8510_add_i2c_device(pdev, setup);
-        }
-#endif
-#if defined(CONFIG_SPI_MASTER)
-        if (setup->spi) {
-                ret = spi_register_driver(&wm8510_spi_driver);
-                if (ret != 0)
-                        printk(KERN_ERR "can't add spi driver");
-        }
-#endif
-
-        if (ret != 0)
-                kfree(codec);
+        ret =  snd_soc_register_codec(&i2c->dev,
+                        &soc_codec_dev_wm8510, &wm8510_dai, 1);
+        if (ret < 0)
+                kfree(wm8510);
         return ret;
 }
 
-/* power down chip */
-static int wm8510_remove(struct platform_device *pdev)
+static __devexit int wm8510_i2c_remove(struct i2c_client *client)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
-
-        if (codec->control_data)
-                wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        i2c_unregister_device(codec->control_data);
-        i2c_del_driver(&wm8510_i2c_driver);
-#endif
-#if defined(CONFIG_SPI_MASTER)
-        spi_unregister_driver(&wm8510_spi_driver);
-#endif
-        kfree(codec);
-
+        snd_soc_unregister_codec(&client->dev);
         return 0;
 }
 
-struct snd_soc_codec_device soc_codec_dev_wm8510 = {
-        .probe =        wm8510_probe,
-        .remove =       wm8510_remove,
-        .suspend =      wm8510_suspend,
-        .resume =       wm8510_resume,
+static const struct i2c_device_id wm8510_i2c_id[] = {
+        { "wm8510", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8510_i2c_id);
+
+static struct i2c_driver wm8510_i2c_driver = {
+        .driver = {
+                .name = "wm8510-codec",
+                .owner = THIS_MODULE,
+        },
+        .probe =    wm8510_i2c_probe,
+        .remove =   __devexit_p(wm8510_i2c_remove),
+        .id_table = wm8510_i2c_id,
 };
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8510);
+#endif
 
 static int __init wm8510_modinit(void)
 {
-        return snd_soc_register_dai(&wm8510_dai);
+        int ret = 0;
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        ret = i2c_add_driver(&wm8510_i2c_driver);
+        if (ret != 0) {
+                printk(KERN_ERR "Failed to register WM8510 I2C driver: %d\n",
+                       ret);
+        }
+#endif
+#if defined(CONFIG_SPI_MASTER)
+        ret = spi_register_driver(&wm8510_spi_driver);
+        if (ret != 0) {
+                printk(KERN_ERR "Failed to register WM8510 SPI driver: %d\n",
+                       ret);
+        }
+#endif
+        return ret;
 }
 module_init(wm8510_modinit);
 
 static void __exit wm8510_exit(void)
 {
-        snd_soc_unregister_dai(&wm8510_dai);
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        i2c_del_driver(&wm8510_i2c_driver);
+#endif
+#if defined(CONFIG_SPI_MASTER)
+        spi_unregister_driver(&wm8510_spi_driver);
+#endif
 }
 module_exit(wm8510_exit);