1 files changed, 49 insertions, 131 deletions

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 1468fe10cbbe..ca646a822444 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -23,7 +23,6 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
@@ -51,12 +50,9 @@ static const u16 wm8974_reg[WM8974_CACHEREGNUM] = {
 #define WM8974_POWER1_BUFIOEN 0x04
 
 struct wm8974_priv {
-        struct snd_soc_codec codec;
-        u16 reg_cache[WM8974_CACHEREGNUM];
+        enum snd_soc_control_type control_type;
 };
 
-static struct snd_soc_codec *wm8974_codec;
-
 #define wm8974_reset(c) snd_soc_write(c, WM8974_RESET, 0)
 
 static const char *wm8974_companding[] = {"Off", "NC", "u-law", "A-law" };
@@ -276,10 +272,11 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
 static int wm8974_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8974_dapm_widgets,
-                                  ARRAY_SIZE(wm8974_dapm_widgets));
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_new_controls(dapm, wm8974_dapm_widgets,
+                                  ARRAY_SIZE(wm8974_dapm_widgets));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         return 0;
 }
@@ -532,7 +529,7 @@ static int wm8974_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_STANDBY:
                 power1 |= WM8974_POWER1_BIASEN | WM8974_POWER1_BUFIOEN;
 
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Initial cap charge at VMID 5k */
                         snd_soc_write(codec, WM8974_POWER1, power1 | 0x3);
                         mdelay(100);
@@ -549,7 +546,7 @@ static int wm8974_set_bias_level(struct snd_soc_codec *codec,
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
@@ -566,8 +563,8 @@ static struct snd_soc_dai_ops wm8974_ops = {
         .set_pll = wm8974_set_dai_pll,
 };
 
-struct snd_soc_dai wm8974_dai = {
-        .name = "WM8974 HiFi",
+static struct snd_soc_dai_driver wm8974_dai = {
+        .name = "wm8974-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
@@ -583,21 +580,15 @@ struct snd_soc_dai wm8974_dai = {
         .ops = &wm8974_ops,
         .symmetric_rates = 1,
 };
-EXPORT_SYMBOL_GPL(wm8974_dai);
 
-static int wm8974_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8974_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;
-
         wm8974_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
-static int wm8974_resume(struct platform_device *pdev)
+static int wm8974_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;
@@ -613,156 +604,72 @@ static int wm8974_resume(struct platform_device *pdev)
         return 0;
 }
 
-static int wm8974_probe(struct platform_device *pdev)
+static int wm8974_probe(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
         int ret = 0;
 
-        if (wm8974_codec == NULL) {
-                dev_err(&pdev->dev, "Codec device not registered\n");
-                return -ENODEV;
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
+                return ret;
         }
 
-        socdev->card->codec = wm8974_codec;
-        codec = wm8974_codec;
-
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
+        ret = wm8974_reset(codec);
         if (ret < 0) {
-                dev_err(codec->dev, "failed to create pcms: %d\n", ret);
-                goto pcm_err;
+                dev_err(codec->dev, "Failed to issue reset\n");
+                return ret;
         }
 
+        wm8974_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         snd_soc_add_controls(codec, wm8974_snd_controls,
                              ARRAY_SIZE(wm8974_snd_controls));
         wm8974_add_widgets(codec);
 
         return ret;
-
-pcm_err:
-        return ret;
 }
 
 /* power down chip */
-static int wm8974_remove(struct platform_device *pdev)
+static int wm8974_remove(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-
+        wm8974_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
-struct snd_soc_codec_device soc_codec_dev_wm8974 = {
+static struct snd_soc_codec_driver soc_codec_dev_wm8974 = {
         .probe =        wm8974_probe,
         .remove =       wm8974_remove,
         .suspend =      wm8974_suspend,
         .resume =       wm8974_resume,
+        .set_bias_level = wm8974_set_bias_level,
+        .reg_cache_size = ARRAY_SIZE(wm8974_reg),
+        .reg_word_size = sizeof(u16),
+        .reg_cache_default = wm8974_reg,
 };
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8974);
-
-static __devinit int wm8974_register(struct wm8974_priv *wm8974)
-{
-        int ret;
-        struct snd_soc_codec *codec = &wm8974->codec;
-
-        if (wm8974_codec) {
-                dev_err(codec->dev, "Another WM8974 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, wm8974);
-        codec->name = "WM8974";
-        codec->owner = THIS_MODULE;
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        codec->set_bias_level = wm8974_set_bias_level;
-        codec->dai = &wm8974_dai;
-        codec->num_dai = 1;
-        codec->reg_cache_size = WM8974_CACHEREGNUM;
-        codec->reg_cache = &wm8974->reg_cache;
-
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-                goto err;
-        }
-
-        memcpy(codec->reg_cache, wm8974_reg, sizeof(wm8974_reg));
-
-        ret = wm8974_reset(codec);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to issue reset\n");
-                goto err;
-        }
-
-        wm8974_dai.dev = codec->dev;
-
-        wm8974_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-        wm8974_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(&wm8974_dai);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
-                goto err_codec;
-        }
-
-        return 0;
-
-err_codec:
-        snd_soc_unregister_codec(codec);
-err:
-        kfree(wm8974);
-        return ret;
-}
-
-static __devexit void wm8974_unregister(struct wm8974_priv *wm8974)
-{
-        wm8974_set_bias_level(&wm8974->codec, SND_SOC_BIAS_OFF);
-        snd_soc_unregister_dai(&wm8974_dai);
-        snd_soc_unregister_codec(&wm8974->codec);
-        kfree(wm8974);
-        wm8974_codec = NULL;
-}
 
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8974_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct wm8974_priv *wm8974;
-        struct snd_soc_codec *codec;
+        int ret;
 
         wm8974 = kzalloc(sizeof(struct wm8974_priv), GFP_KERNEL);
         if (wm8974 == NULL)
                 return -ENOMEM;
 
-        codec = &wm8974->codec;
-        codec->hw_write = (hw_write_t)i2c_master_send;
-
         i2c_set_clientdata(i2c, wm8974);
-        codec->control_data = i2c;
-
-        codec->dev = &i2c->dev;
 
-        return wm8974_register(wm8974);
+        ret = snd_soc_register_codec(&i2c->dev,
+                        &soc_codec_dev_wm8974, &wm8974_dai, 1);
+        if (ret < 0)
+                kfree(wm8974);
+        return ret;
 }
 
 static __devexit int wm8974_i2c_remove(struct i2c_client *client)
 {
-        struct wm8974_priv *wm8974 = i2c_get_clientdata(client);
-        wm8974_unregister(wm8974);
+        snd_soc_unregister_codec(&client->dev);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
@@ -774,23 +681,34 @@ MODULE_DEVICE_TABLE(i2c, wm8974_i2c_id);
 
 static struct i2c_driver wm8974_i2c_driver = {
         .driver = {
-                .name = "WM8974",
+                .name = "wm8974-codec",
                 .owner = THIS_MODULE,
         },
         .probe =    wm8974_i2c_probe,
         .remove =   __devexit_p(wm8974_i2c_remove),
         .id_table = wm8974_i2c_id,
 };
+#endif
 
 static int __init wm8974_modinit(void)
 {
-        return i2c_add_driver(&wm8974_i2c_driver);
+        int ret = 0;
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        ret = i2c_add_driver(&wm8974_i2c_driver);
+        if (ret != 0) {
+                printk(KERN_ERR "Failed to register wm8974 I2C driver: %d\n",
+                       ret);
+        }
+#endif
+        return ret;
 }
 module_init(wm8974_modinit);
 
 static void __exit wm8974_exit(void)
 {
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8974_i2c_driver);
+#endif
 }
 module_exit(wm8974_exit);