1 files changed, 116 insertions, 191 deletions

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index f7dcabf6283c..9b3bba4df5b3 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -24,16 +24,12 @@
 #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>
 #include <sound/wm8904.h>
 
 #include "wm8904.h"
 
-static struct snd_soc_codec *wm8904_codec;
-struct snd_soc_codec_device soc_codec_dev_wm8904;
-
 enum wm8904_type {
         WM8904,
         WM8912,
@@ -52,10 +48,9 @@ static const char *wm8904_supply_names[WM8904_NUM_SUPPLIES] = {
 
 /* codec private data */
 struct wm8904_priv {
-        struct snd_soc_codec codec;
-        u16 reg_cache[WM8904_MAX_REGISTER + 1];
 
         enum wm8904_type devtype;
+        void *control_data;
 
         struct regulator_bulk_data supplies[WM8904_NUM_SUPPLIES];
 
@@ -601,7 +596,7 @@ static struct {
         { 0x003F, 0x003F, 0 }, /* R248 - FLL NCO Test 1 */
 };
 
-static int wm8904_volatile_register(unsigned int reg)
+static int wm8904_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
 {
         return wm8904_access[reg].vol;
 }
@@ -689,7 +684,7 @@ static int wm8904_put_drc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);  
+        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         struct wm8904_pdata *pdata = wm8904->pdata;
         int value = ucontrol->value.integer.value[0];
 
@@ -760,7 +755,7 @@ static int wm8904_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);  
+        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         struct wm8904_pdata *pdata = wm8904->pdata;
         int value = ucontrol->value.integer.value[0];
 
@@ -820,7 +815,8 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
 
-        return wm8904->deemph;
+        ucontrol->value.enumerated.item[0] = wm8904->deemph;
+        return 0;
 }
 
 static int wm8904_put_deemph(struct snd_kcontrol *kcontrol,
@@ -1430,10 +1426,11 @@ static const struct snd_soc_dapm_route wm8912_intercon[] = {
 static int wm8904_add_widgets(struct snd_soc_codec *codec)
 {
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_new_controls(codec, wm8904_core_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8904_core_dapm_widgets,
                                   ARRAY_SIZE(wm8904_core_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, core_intercon,
+        snd_soc_dapm_add_routes(dapm, core_intercon,
                                 ARRAY_SIZE(core_intercon));
 
         switch (wm8904->devtype) {
@@ -1445,20 +1442,20 @@ static int wm8904_add_widgets(struct snd_soc_codec *codec)
                 snd_soc_add_controls(codec, wm8904_snd_controls,
                                      ARRAY_SIZE(wm8904_snd_controls));
 
-                snd_soc_dapm_new_controls(codec, wm8904_adc_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_adc_dapm_widgets,
                                           ARRAY_SIZE(wm8904_adc_dapm_widgets));
-                snd_soc_dapm_new_controls(codec, wm8904_dac_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_dac_dapm_widgets,
                                           ARRAY_SIZE(wm8904_dac_dapm_widgets));
-                snd_soc_dapm_new_controls(codec, wm8904_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_dapm_widgets,
                                           ARRAY_SIZE(wm8904_dapm_widgets));
 
-                snd_soc_dapm_add_routes(codec, core_intercon,
+                snd_soc_dapm_add_routes(dapm, core_intercon,
                                         ARRAY_SIZE(core_intercon));
-                snd_soc_dapm_add_routes(codec, adc_intercon,
+                snd_soc_dapm_add_routes(dapm, adc_intercon,
                                         ARRAY_SIZE(adc_intercon));
-                snd_soc_dapm_add_routes(codec, dac_intercon,
+                snd_soc_dapm_add_routes(dapm, dac_intercon,
                                         ARRAY_SIZE(dac_intercon));
-                snd_soc_dapm_add_routes(codec, wm8904_intercon,
+                snd_soc_dapm_add_routes(dapm, wm8904_intercon,
                                         ARRAY_SIZE(wm8904_intercon));
                 break;
 
@@ -1466,17 +1463,17 @@ static int wm8904_add_widgets(struct snd_soc_codec *codec)
                 snd_soc_add_controls(codec, wm8904_dac_snd_controls,
                                      ARRAY_SIZE(wm8904_dac_snd_controls));
 
-                snd_soc_dapm_new_controls(codec, wm8904_dac_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_dac_dapm_widgets,
                                           ARRAY_SIZE(wm8904_dac_dapm_widgets));
 
-                snd_soc_dapm_add_routes(codec, dac_intercon,
+                snd_soc_dapm_add_routes(dapm, dac_intercon,
                                         ARRAY_SIZE(dac_intercon));
-                snd_soc_dapm_add_routes(codec, wm8912_intercon,
+                snd_soc_dapm_add_routes(dapm, wm8912_intercon,
                                         ARRAY_SIZE(wm8912_intercon));
                 break;
         }
 
-        snd_soc_dapm_new_widgets(codec);
+        snd_soc_dapm_new_widgets(dapm);
         return 0;
 }
 
@@ -1592,7 +1589,7 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream,
                        - wm8904->fs);
         for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
                 cur_val = abs((wm8904->sysclk_rate /
-                               clk_sys_rates[i].ratio) - wm8904->fs);;
+                               clk_sys_rates[i].ratio) - wm8904->fs);
                 if (cur_val < best_val) {
                         best = i;
                         best_val = cur_val;
@@ -1898,7 +1895,7 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
 
         pr_debug("Fvco=%dHz\n", target);
 
-        /* Find an appropraite FLL_FRATIO and factor it out of the target */
+        /* Find an appropriate FLL_FRATIO and factor it out of the target */
         for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) {
                 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) {
                         fll_div->fll_fratio = fll_fratios[i].fll_fratio;
@@ -2095,7 +2092,7 @@ static int wm8904_digital_mute(struct snd_soc_dai *codec_dai, int mute)
 
 static void wm8904_sync_cache(struct snd_soc_codec *codec)
 {
-        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
+        u16 *reg_cache = codec->reg_cache;
         int i;
 
         if (!codec->cache_sync)
@@ -2106,14 +2103,14 @@ static void wm8904_sync_cache(struct snd_soc_codec *codec)
         /* Sync back cached values if they're different from the
          * hardware default.
          */
-        for (i = 1; i < ARRAY_SIZE(wm8904->reg_cache); i++) {
+        for (i = 1; i < codec->driver->reg_cache_size; i++) {
                 if (!wm8904_access[i].writable)
                         continue;
 
-                if (wm8904->reg_cache[i] == wm8904_reg[i])
+                if (reg_cache[i] == wm8904_reg[i])
                         continue;
 
-                snd_soc_write(codec, i, wm8904->reg_cache[i]);
+                snd_soc_write(codec, i, reg_cache[i]);
         }
 
         codec->cache_sync = 0;
@@ -2141,7 +2138,7 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         ret = regulator_bulk_enable(ARRAY_SIZE(wm8904->supplies),
                                                     wm8904->supplies);
                         if (ret != 0) {
@@ -2200,7 +2197,7 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,
                                        wm8904->supplies);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
@@ -2218,8 +2215,8 @@ static struct snd_soc_dai_ops wm8904_dai_ops = {
         .digital_mute = wm8904_digital_mute,
 };
 
-struct snd_soc_dai wm8904_dai = {
-        .name = "WM8904",
+static struct snd_soc_dai_driver wm8904_dai = {
+        .name = "wm8904-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
@@ -2237,24 +2234,17 @@ struct snd_soc_dai wm8904_dai = {
         .ops = &wm8904_dai_ops,
         .symmetric_rates = 1,
 };
-EXPORT_SYMBOL_GPL(wm8904_dai);
 
 #ifdef CONFIG_PM
-static int wm8904_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8904_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;
-
         wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         return 0;
 }
 
-static int wm8904_resume(struct platform_device *pdev)
+static int wm8904_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
-
         wm8904_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
@@ -2264,9 +2254,9 @@ static int wm8904_resume(struct platform_device *pdev)
 #define wm8904_resume NULL
 #endif
 
-static void wm8904_handle_retune_mobile_pdata(struct wm8904_priv *wm8904)
+static void wm8904_handle_retune_mobile_pdata(struct snd_soc_codec *codec)
 {
-        struct snd_soc_codec *codec = &wm8904->codec;
+        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         struct wm8904_pdata *pdata = wm8904->pdata;
         struct snd_kcontrol_new control =
                 SOC_ENUM_EXT("EQ Mode",
@@ -2315,20 +2305,20 @@ static void wm8904_handle_retune_mobile_pdata(struct wm8904_priv *wm8904)
         wm8904->retune_mobile_enum.max = wm8904->num_retune_mobile_texts;
         wm8904->retune_mobile_enum.texts = wm8904->retune_mobile_texts;
 
-        ret = snd_soc_add_controls(&wm8904->codec, &control, 1);
+        ret = snd_soc_add_controls(codec, &control, 1);
         if (ret != 0)
-                dev_err(wm8904->codec.dev,
+                dev_err(codec->dev,
                         "Failed to add ReTune Mobile control: %d\n", ret);
 }
 
-static void wm8904_handle_pdata(struct wm8904_priv *wm8904)
+static void wm8904_handle_pdata(struct snd_soc_codec *codec)
 {
-        struct snd_soc_codec *codec = &wm8904->codec;
+        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         struct wm8904_pdata *pdata = wm8904->pdata;
         int ret, i;
 
         if (!pdata) {
-                snd_soc_add_controls(&wm8904->codec, wm8904_eq_controls,
+                snd_soc_add_controls(codec, wm8904_eq_controls,
                                      ARRAY_SIZE(wm8904_eq_controls));
                 return;
         }
@@ -2344,7 +2334,7 @@ static void wm8904_handle_pdata(struct wm8904_priv *wm8904)
                 wm8904->drc_texts = kmalloc(sizeof(char *)
                                             * pdata->num_drc_cfgs, GFP_KERNEL);
                 if (!wm8904->drc_texts) {
-                        dev_err(wm8904->codec.dev,
+                        dev_err(codec->dev,
                                 "Failed to allocate %d DRC config texts\n",
                                 pdata->num_drc_cfgs);
                         return;
@@ -2356,9 +2346,9 @@ static void wm8904_handle_pdata(struct wm8904_priv *wm8904)
                 wm8904->drc_enum.max = pdata->num_drc_cfgs;
                 wm8904->drc_enum.texts = wm8904->drc_texts;
 
-                ret = snd_soc_add_controls(&wm8904->codec, &control, 1);
+                ret = snd_soc_add_controls(codec, &control, 1);
                 if (ret != 0)
-                        dev_err(wm8904->codec.dev,
+                        dev_err(codec->dev,
                                 "Failed to add DRC mode control: %d\n", ret);
 
                 wm8904_set_drc(codec);
@@ -2368,91 +2358,22 @@ static void wm8904_handle_pdata(struct wm8904_priv *wm8904)
                 pdata->num_retune_mobile_cfgs);
 
         if (pdata->num_retune_mobile_cfgs)
-                wm8904_handle_retune_mobile_pdata(wm8904);
+                wm8904_handle_retune_mobile_pdata(codec);
         else
-                snd_soc_add_controls(&wm8904->codec, wm8904_eq_controls,
+                snd_soc_add_controls(codec, wm8904_eq_controls,
                                      ARRAY_SIZE(wm8904_eq_controls));
 }
 
-static int wm8904_probe(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
-        int ret = 0;
-
-        if (wm8904_codec == NULL) {
-                dev_err(&pdev->dev, "Codec device not registered\n");
-                return -ENODEV;
-        }
-
-        socdev->card->codec = wm8904_codec;
-        codec = wm8904_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;
-        }
-
-        wm8904_handle_pdata(snd_soc_codec_get_drvdata(codec));
-
-        wm8904_add_widgets(codec);
-
-        return ret;
-
-pcm_err:
-        return ret;
-}
-
-static int wm8904_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_wm8904 = {
-        .probe =        wm8904_probe,
-        .remove =       wm8904_remove,
-        .suspend =      wm8904_suspend,
-        .resume =       wm8904_resume,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8904);
 
-static int wm8904_register(struct wm8904_priv *wm8904,
-                           enum snd_soc_control_type control)
+static int wm8904_probe(struct snd_soc_codec *codec)
 {
+        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         struct wm8904_pdata *pdata = wm8904->pdata;
-        int ret;
-        struct snd_soc_codec *codec = &wm8904->codec;
-        int i;
-
-        if (wm8904_codec) {
-                dev_err(codec->dev, "Another WM8904 is registered\n");
-                ret = -EINVAL;
-                goto err;
-        }
+        u16 *reg_cache = codec->reg_cache;
+        int ret, i;
 
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-
-        snd_soc_codec_set_drvdata(codec, wm8904);
-        codec->name = "WM8904";
-        codec->owner = THIS_MODULE;
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        codec->set_bias_level = wm8904_set_bias_level;
-        codec->dai = &wm8904_dai;
-        codec->num_dai = 1;
-        codec->reg_cache_size = WM8904_MAX_REGISTER;
-        codec->reg_cache = &wm8904->reg_cache;
-        codec->volatile_register = wm8904_volatile_register;
         codec->cache_sync = 1;
-        codec->idle_bias_off = 1;
+        codec->dapm.idle_bias_off = 1;
 
         switch (wm8904->devtype) {
         case WM8904:
@@ -2463,16 +2384,13 @@ static int wm8904_register(struct wm8904_priv *wm8904,
         default:
                 dev_err(codec->dev, "Unknown device type %d\n",
                         wm8904->devtype);
-                ret = -EINVAL;
-                goto err;
+                return -EINVAL;
         }
 
-        memcpy(codec->reg_cache, wm8904_reg, sizeof(wm8904_reg));
-
-        ret = snd_soc_codec_set_cache_io(codec, 8, 16, control);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-                goto err;
+                return ret;
         }
 
         for (i = 0; i < ARRAY_SIZE(wm8904->supplies); i++)
@@ -2482,7 +2400,7 @@ static int wm8904_register(struct wm8904_priv *wm8904,
                                  wm8904->supplies);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
-                goto err;
+                return ret;
         }
 
         ret = regulator_bulk_enable(ARRAY_SIZE(wm8904->supplies),
@@ -2517,22 +2435,29 @@ static int wm8904_register(struct wm8904_priv *wm8904,
                 goto err_enable;
         }
 
-        wm8904_dai.dev = codec->dev;
-
         /* Change some default settings - latch VU and enable ZC */
-        wm8904->reg_cache[WM8904_ADC_DIGITAL_VOLUME_LEFT] |= WM8904_ADC_VU;
-        wm8904->reg_cache[WM8904_ADC_DIGITAL_VOLUME_RIGHT] |= WM8904_ADC_VU;
-        wm8904->reg_cache[WM8904_DAC_DIGITAL_VOLUME_LEFT] |= WM8904_DAC_VU;
-        wm8904->reg_cache[WM8904_DAC_DIGITAL_VOLUME_RIGHT] |= WM8904_DAC_VU;
-        wm8904->reg_cache[WM8904_ANALOGUE_OUT1_LEFT] |= WM8904_HPOUT_VU |
-                WM8904_HPOUTLZC;
-        wm8904->reg_cache[WM8904_ANALOGUE_OUT1_RIGHT] |= WM8904_HPOUT_VU |
-                WM8904_HPOUTRZC;
-        wm8904->reg_cache[WM8904_ANALOGUE_OUT2_LEFT] |= WM8904_LINEOUT_VU |
-                WM8904_LINEOUTLZC;
-        wm8904->reg_cache[WM8904_ANALOGUE_OUT2_RIGHT] |= WM8904_LINEOUT_VU |
-                WM8904_LINEOUTRZC;
-        wm8904->reg_cache[WM8904_CLOCK_RATES_0] &= ~WM8904_SR_MODE;
+        snd_soc_update_bits(codec, WM8904_ADC_DIGITAL_VOLUME_LEFT,
+                            WM8904_ADC_VU, WM8904_ADC_VU);
+        snd_soc_update_bits(codec, WM8904_ADC_DIGITAL_VOLUME_RIGHT,
+                            WM8904_ADC_VU, WM8904_ADC_VU);
+        snd_soc_update_bits(codec, WM8904_DAC_DIGITAL_VOLUME_LEFT,
+                            WM8904_DAC_VU, WM8904_DAC_VU);
+        snd_soc_update_bits(codec, WM8904_DAC_DIGITAL_VOLUME_RIGHT,
+                            WM8904_DAC_VU, WM8904_DAC_VU);
+        snd_soc_update_bits(codec, WM8904_ANALOGUE_OUT1_LEFT,
+                            WM8904_HPOUT_VU | WM8904_HPOUTLZC,
+                            WM8904_HPOUT_VU | WM8904_HPOUTLZC);
+        snd_soc_update_bits(codec, WM8904_ANALOGUE_OUT1_RIGHT,
+                            WM8904_HPOUT_VU | WM8904_HPOUTRZC,
+                            WM8904_HPOUT_VU | WM8904_HPOUTRZC);
+        snd_soc_update_bits(codec, WM8904_ANALOGUE_OUT2_LEFT,
+                            WM8904_LINEOUT_VU | WM8904_LINEOUTLZC,
+                            WM8904_LINEOUT_VU | WM8904_LINEOUTLZC);
+        snd_soc_update_bits(codec, WM8904_ANALOGUE_OUT2_RIGHT,
+                            WM8904_LINEOUT_VU | WM8904_LINEOUTRZC,
+                            WM8904_LINEOUT_VU | WM8904_LINEOUTRZC);
+        snd_soc_update_bits(codec, WM8904_CLOCK_RATES_0,
+                            WM8904_SR_MODE, 0);
 
         /* Apply configuration from the platform data. */
         if (wm8904->pdata) {
@@ -2540,95 +2465,95 @@ static int wm8904_register(struct wm8904_priv *wm8904,
                         if (!pdata->gpio_cfg[i])
                                 continue;
 
-                        wm8904->reg_cache[WM8904_GPIO_CONTROL_1 + i]
+                        reg_cache[WM8904_GPIO_CONTROL_1 + i]
                                 = pdata->gpio_cfg[i] & 0xffff;
                 }
 
                 /* Zero is the default value for these anyway */
                 for (i = 0; i < WM8904_MIC_REGS; i++)
-                        wm8904->reg_cache[WM8904_MIC_BIAS_CONTROL_0 + i]
+                        reg_cache[WM8904_MIC_BIAS_CONTROL_0 + i]
                                 = pdata->mic_cfg[i];
         }
 
         /* Set Class W by default - this will be managed by the Class
          * G widget at runtime where bypass paths are available.
          */
-        wm8904->reg_cache[WM8904_CLASS_W_0] |= WM8904_CP_DYN_PWR;
+        snd_soc_update_bits(codec, WM8904_CLASS_W_0,
+                            WM8904_CP_DYN_PWR, WM8904_CP_DYN_PWR);
 
         /* Use normal bias source */
-        wm8904->reg_cache[WM8904_BIAS_CONTROL_0] &= ~WM8904_POBCTRL;
+        snd_soc_update_bits(codec, WM8904_BIAS_CONTROL_0,
+                            WM8904_POBCTRL, 0);
 
         wm8904_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Bias level configuration will have done an extra enable */
         regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
 
-        wm8904_codec = codec;
+        wm8904_handle_pdata(codec);
 
-        ret = snd_soc_register_codec(codec);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-                goto err_enable;
-        }
-
-        ret = snd_soc_register_dai(&wm8904_dai);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
-                goto err_codec;
-        }
+        wm8904_add_widgets(codec);
 
         return 0;
 
-err_codec:
-        snd_soc_unregister_codec(codec);
 err_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
 err_get:
         regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
-err:
-        kfree(wm8904);
         return ret;
 }
 
-static void wm8904_unregister(struct wm8904_priv *wm8904)
+static int wm8904_remove(struct snd_soc_codec *codec)
 {
-        wm8904_set_bias_level(&wm8904->codec, SND_SOC_BIAS_OFF);
+        struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
+
+        wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF);
         regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
-        snd_soc_unregister_dai(&wm8904_dai);
-        snd_soc_unregister_codec(&wm8904->codec);
-        kfree(wm8904);
-        wm8904_codec = NULL;
+        kfree(wm8904->retune_mobile_texts);
+        kfree(wm8904->drc_texts);
+
+        return 0;
 }
 
+static struct snd_soc_codec_driver soc_codec_dev_wm8904 = {
+        .probe =        wm8904_probe,
+        .remove =       wm8904_remove,
+        .suspend =      wm8904_suspend,
+        .resume =       wm8904_resume,
+        .set_bias_level = wm8904_set_bias_level,
+        .reg_cache_size = ARRAY_SIZE(wm8904_reg),
+        .reg_word_size = sizeof(u16),
+        .reg_cache_default = wm8904_reg,
+        .volatile_register = wm8904_volatile_register,
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct wm8904_priv *wm8904;
-        struct snd_soc_codec *codec;
+        int ret;
 
         wm8904 = kzalloc(sizeof(struct wm8904_priv), GFP_KERNEL);
         if (wm8904 == NULL)
                 return -ENOMEM;
 
-        codec = &wm8904->codec;
-        codec->hw_write = (hw_write_t)i2c_master_send;
-
         wm8904->devtype = id->driver_data;
-
         i2c_set_clientdata(i2c, wm8904);
-        codec->control_data = i2c;
+        wm8904->control_data = i2c;
         wm8904->pdata = i2c->dev.platform_data;
 
-        codec->dev = &i2c->dev;
-
-        return wm8904_register(wm8904, SND_SOC_I2C);
+        ret = snd_soc_register_codec(&i2c->dev,
+                        &soc_codec_dev_wm8904, &wm8904_dai, 1);
+        if (ret < 0)
+                kfree(wm8904);
+        return ret;
 }
 
 static __devexit int wm8904_i2c_remove(struct i2c_client *client)
 {
-        struct wm8904_priv *wm8904 = i2c_get_clientdata(client);
-        wm8904_unregister(wm8904);
+        snd_soc_unregister_codec(&client->dev);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
@@ -2641,7 +2566,7 @@ MODULE_DEVICE_TABLE(i2c, wm8904_i2c_id);
 
 static struct i2c_driver wm8904_i2c_driver = {
         .driver = {
-                .name = "WM8904",
+                .name = "wm8904-codec",
                 .owner = THIS_MODULE,
         },
         .probe =    wm8904_i2c_probe,
@@ -2652,15 +2577,15 @@ static struct i2c_driver wm8904_i2c_driver = {
 
 static int __init wm8904_modinit(void)
 {
-        int ret;
+        int ret = 0;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         ret = i2c_add_driver(&wm8904_i2c_driver);
         if (ret != 0) {
-                printk(KERN_ERR "Failed to register WM8904 I2C driver: %d\n",
+                printk(KERN_ERR "Failed to register wm8904 I2C driver: %d\n",
                        ret);
         }
 #endif
-        return 0;
+        return ret;
 }
 module_init(wm8904_modinit);