1 files changed, 174 insertions, 202 deletions

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 0ab9b6355297..76b4361e9b80 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -26,15 +26,11 @@
 #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 "wm8731.h"
 
-static struct snd_soc_codec *wm8731_codec;
-struct snd_soc_codec_device soc_codec_dev_wm8731;
-
 #define WM8731_NUM_SUPPLIES 4
 static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
         "AVDD",
@@ -45,10 +41,12 @@ static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
 
 /* codec private data */
 struct wm8731_priv {
-        struct snd_soc_codec codec;
+        enum snd_soc_control_type control_type;
         struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
-        u16 reg_cache[WM8731_CACHEREGNUM];
         unsigned int sysclk;
+        int sysclk_type;
+        int playback_fs;
+        bool deemph;
 };
 
 
@@ -67,16 +65,79 @@ static const u16 wm8731_reg[WM8731_CACHEREGNUM] = {
 #define wm8731_reset(c) snd_soc_write(c, WM8731_RESET, 0)
 
 static const char *wm8731_input_select[] = {"Line In", "Mic"};
-static const char *wm8731_deemph[] = {"None", "32Khz", "44.1Khz", "48Khz"};
 
-static const struct soc_enum wm8731_enum[] = {
-        SOC_ENUM_SINGLE(WM8731_APANA, 2, 2, wm8731_input_select),
-        SOC_ENUM_SINGLE(WM8731_APDIGI, 1, 4, wm8731_deemph),
-};
+static const struct soc_enum wm8731_insel_enum =
+        SOC_ENUM_SINGLE(WM8731_APANA, 2, 2, wm8731_input_select);
+
+static int wm8731_deemph[] = { 0, 32000, 44100, 48000 };
+
+static int wm8731_set_deemph(struct snd_soc_codec *codec)
+{
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+        int val, i, best;
+
+        /* If we're using deemphasis select the nearest available sample
+         * rate.
+         */
+        if (wm8731->deemph) {
+                best = 1;
+                for (i = 2; i < ARRAY_SIZE(wm8731_deemph); i++) {
+                        if (abs(wm8731_deemph[i] - wm8731->playback_fs) <
+                            abs(wm8731_deemph[best] - wm8731->playback_fs))
+                                best = i;
+                }
+
+                val = best << 1;
+        } else {
+                best = 0;
+                val = 0;
+        }
+
+        dev_dbg(codec->dev, "Set deemphasis %d (%dHz)\n",
+                best, wm8731_deemph[best]);
+
+        return snd_soc_update_bits(codec, WM8731_APDIGI, 0x6, val);
+}
+
+static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+
+        ucontrol->value.enumerated.item[0] = wm8731->deemph;
+
+        return 0;
+}
+
+static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+        int deemph = ucontrol->value.enumerated.item[0];
+        int ret = 0;
+
+        if (deemph > 1)
+                return -EINVAL;
+
+        mutex_lock(&codec->mutex);
+        if (wm8731->deemph != deemph) {
+                wm8731->deemph = deemph;
+
+                wm8731_set_deemph(codec);
+
+                ret = 1;
+        }
+        mutex_unlock(&codec->mutex);
+
+        return ret;
+}
 
 static const DECLARE_TLV_DB_SCALE(in_tlv, -3450, 150, 0);
 static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -1500, 300, 0);
 static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
+static const DECLARE_TLV_DB_SCALE(mic_tlv, 0, 2000, 0);
 
 static const struct snd_kcontrol_new wm8731_snd_controls[] = {
 
@@ -89,7 +150,7 @@ SOC_DOUBLE_R_TLV("Capture Volume", WM8731_LINVOL, WM8731_RINVOL, 0, 31, 0,
                  in_tlv),
 SOC_DOUBLE_R("Line Capture Switch", WM8731_LINVOL, WM8731_RINVOL, 7, 1, 1),
 
-SOC_SINGLE("Mic Boost (+20dB)", WM8731_APANA, 0, 1, 0),
+SOC_SINGLE_TLV("Mic Boost Volume", WM8731_APANA, 0, 1, 0, mic_tlv),
 SOC_SINGLE("Mic Capture Switch", WM8731_APANA, 1, 1, 1),
 
 SOC_SINGLE_TLV("Sidetone Playback Volume", WM8731_APANA, 6, 3, 1,
@@ -98,7 +159,8 @@ SOC_SINGLE_TLV("Sidetone Playback Volume", WM8731_APANA, 6, 3, 1,
 SOC_SINGLE("ADC High Pass Filter Switch", WM8731_APDIGI, 0, 1, 1),
 SOC_SINGLE("Store DC Offset Switch", WM8731_APDIGI, 4, 1, 0),
 
-SOC_ENUM("Playback De-emphasis", wm8731_enum[1]),
+SOC_SINGLE_BOOL_EXT("Playback Deemphasis Switch", 0,
+                    wm8731_get_deemph, wm8731_put_deemph),
 };
 
 /* Output Mixer */
@@ -110,9 +172,11 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),
 
 /* Input mux */
 static const struct snd_kcontrol_new wm8731_input_mux_controls =
-SOC_DAPM_ENUM("Input Select", wm8731_enum[0]);
+SOC_DAPM_ENUM("Input Select", wm8731_insel_enum);
 
 static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = {
+SND_SOC_DAPM_SUPPLY("ACTIVE",WM8731_ACTIVE, 0, 0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("OSC", WM8731_PWR, 5, 1, NULL, 0),
 SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1,
         &wm8731_output_mixer_controls[0],
         ARRAY_SIZE(wm8731_output_mixer_controls)),
@@ -130,7 +194,20 @@ SND_SOC_DAPM_INPUT("RLINEIN"),
 SND_SOC_DAPM_INPUT("LLINEIN"),
 };
 
-static const struct snd_soc_dapm_route intercon[] = {
+static int wm8731_check_osc(struct snd_soc_dapm_widget *source,
+                            struct snd_soc_dapm_widget *sink)
+{
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(source->codec);
+
+        return wm8731->sysclk_type == WM8731_SYSCLK_XTAL;
+}
+
+static const struct snd_soc_dapm_route wm8731_intercon[] = {
+        {"DAC", NULL, "OSC", wm8731_check_osc},
+        {"ADC", NULL, "OSC", wm8731_check_osc},
+        {"DAC", NULL, "ACTIVE"},
+        {"ADC", NULL, "ACTIVE"},
+
         /* output mixer */
         {"Output Mixer", "Line Bypass Switch", "Line Input"},
         {"Output Mixer", "HiFi Playback Switch", "DAC"},
@@ -153,16 +230,6 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Mic Bias", NULL, "MICIN"},
 };
 
-static int wm8731_add_widgets(struct snd_soc_codec *codec)
-{
-        snd_soc_dapm_new_controls(codec, wm8731_dapm_widgets,
-                                  ARRAY_SIZE(wm8731_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
-
-        return 0;
-}
-
 struct _coeff_div {
         u32 mclk;
         u32 rate;
@@ -222,15 +289,15 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream,
                             struct snd_pcm_hw_params *params,
                             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 = dai->codec;
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
         u16 iface = snd_soc_read(codec, WM8731_IFACE) & 0xfff3;
         int i = get_coeff(wm8731->sysclk, params_rate(params));
         u16 srate = (coeff_div[i].sr << 2) |
                 (coeff_div[i].bosr << 1) | coeff_div[i].usb;
 
+        wm8731->playback_fs = params_rate(params);
+
         snd_soc_write(codec, WM8731_SRATE, srate);
 
         /* bit size */
@@ -245,37 +312,12 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream,
                 break;
         }
 
-        snd_soc_write(codec, WM8731_IFACE, iface);
-        return 0;
-}
-
-static int wm8731_pcm_prepare(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;
-
-        /* set active */
-        snd_soc_write(codec, WM8731_ACTIVE, 0x0001);
+        wm8731_set_deemph(codec);
 
+        snd_soc_write(codec, WM8731_IFACE, iface);
         return 0;
 }
 
-static void wm8731_shutdown(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;
-
-        /* deactivate */
-        if (!codec->active) {
-                udelay(50);
-                snd_soc_write(codec, WM8731_ACTIVE, 0x0);
-        }
-}
-
 static int wm8731_mute(struct snd_soc_dai *dai, int mute)
 {
         struct snd_soc_codec *codec = dai->codec;
@@ -294,6 +336,15 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
         struct snd_soc_codec *codec = codec_dai->codec;
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
 
+        switch (clk_id) {
+        case WM8731_SYSCLK_XTAL:
+        case WM8731_SYSCLK_MCLK:
+                wm8731->sysclk_type = clk_id;
+                break;
+        default:
+                return -EINVAL;
+        }
+
         switch (freq) {
         case 11289600:
         case 12000000:
@@ -301,9 +352,14 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
         case 16934400:
         case 18432000:
                 wm8731->sysclk = freq;
-                return 0;
+                break;
+        default:
+                return -EINVAL;
         }
-        return -EINVAL;
+
+        snd_soc_dapm_sync(&codec->dapm);
+
+        return 0;
 }
 
 
@@ -381,7 +437,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_PREPARE:
                 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(wm8731->supplies),
                                                     wm8731->supplies);
                         if (ret != 0)
@@ -404,13 +460,12 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
                 snd_soc_write(codec, WM8731_PWR, reg | 0x0040);
                 break;
         case SND_SOC_BIAS_OFF:
-                snd_soc_write(codec, WM8731_ACTIVE, 0x0);
                 snd_soc_write(codec, WM8731_PWR, 0xffff);
                 regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
                                        wm8731->supplies);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
@@ -420,16 +475,14 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_ops wm8731_dai_ops = {
-        .prepare        = wm8731_pcm_prepare,
         .hw_params      = wm8731_hw_params,
-        .shutdown       = wm8731_shutdown,
         .digital_mute   = wm8731_mute,
         .set_sysclk     = wm8731_set_dai_sysclk,
         .set_fmt        = wm8731_set_dai_fmt,
 };
 
-struct snd_soc_dai wm8731_dai = {
-        .name = "WM8731",
+static struct snd_soc_dai_driver wm8731_dai = {
+        .name = "wm8731-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
@@ -445,24 +498,17 @@ struct snd_soc_dai wm8731_dai = {
         .ops = &wm8731_dai_ops,
         .symmetric_rates = 1,
 };
-EXPORT_SYMBOL_GPL(wm8731_dai);
 
 #ifdef CONFIG_PM
-static int wm8731_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8731_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;
-
         wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         return 0;
 }
 
-static int wm8731_resume(struct platform_device *pdev)
+static int wm8731_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
-
         wm8731_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
@@ -472,88 +518,15 @@ static int wm8731_resume(struct platform_device *pdev)
 #define wm8731_resume NULL
 #endif
 
-static int wm8731_probe(struct platform_device *pdev)
+static int wm8731_probe(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
-        int ret = 0;
-
-        if (wm8731_codec == NULL) {
-                dev_err(&pdev->dev, "Codec device not registered\n");
-                return -ENODEV;
-        }
-
-        socdev->card->codec = wm8731_codec;
-        codec = wm8731_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, wm8731_snd_controls,
-                             ARRAY_SIZE(wm8731_snd_controls));
-        wm8731_add_widgets(codec);
-
-        return ret;
-
-pcm_err:
-        return ret;
-}
-
-/* power down chip */
-static int wm8731_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_wm8731 = {
-        .probe =        wm8731_probe,
-        .remove =       wm8731_remove,
-        .suspend =      wm8731_suspend,
-        .resume =       wm8731_resume,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8731);
-
-static int wm8731_register(struct wm8731_priv *wm8731,
-                           enum snd_soc_control_type control)
-{
-        int ret, i;
-        struct snd_soc_codec *codec = &wm8731->codec;
-
-        if (wm8731_codec) {
-                dev_err(codec->dev, "Another WM8731 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, wm8731);
-        codec->name = "WM8731";
-        codec->owner = THIS_MODULE;
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        codec->set_bias_level = wm8731_set_bias_level;
-        codec->dai = &wm8731_dai;
-        codec->num_dai = 1;
-        codec->reg_cache_size = WM8731_CACHEREGNUM;
-        codec->reg_cache = &wm8731->reg_cache;
-
-        memcpy(codec->reg_cache, wm8731_reg, sizeof(wm8731_reg));
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+        int ret = 0, i;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, control);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8731->control_type);
         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(wm8731->supplies); i++)
@@ -563,7 +536,7 @@ static int wm8731_register(struct wm8731_priv *wm8731,
                                  wm8731->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(wm8731->supplies),
@@ -579,8 +552,6 @@ static int wm8731_register(struct wm8731_priv *wm8731,
                 goto err_regulator_enable;
         }
 
-        wm8731_dai.dev = codec->dev;
-
         wm8731_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Latch the update bits */
@@ -590,81 +561,82 @@ static int wm8731_register(struct wm8731_priv *wm8731,
         snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0);
 
         /* Disable bypass path by default */
-        snd_soc_update_bits(codec, WM8731_APANA, 0x4, 0);
+        snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0);
 
-        wm8731_codec = codec;
-
-        ret = snd_soc_register_codec(codec);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-                goto err_regulator_enable;
-        }
-
-        ret = snd_soc_register_dai(&wm8731_dai);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
-                snd_soc_unregister_codec(codec);
-                goto err_codec;
-        }
+        snd_soc_add_controls(codec, wm8731_snd_controls,
+                             ARRAY_SIZE(wm8731_snd_controls));
 
         /* Regulators will have been enabled by bias management */
         regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 
         return 0;
 
-err_codec:
-        snd_soc_unregister_codec(codec);
 err_regulator_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 err_regulator_get:
         regulator_bulk_free(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
-err:
-        kfree(wm8731);
+
         return ret;
 }
 
-static void wm8731_unregister(struct wm8731_priv *wm8731)
+/* power down chip */
+static int wm8731_remove(struct snd_soc_codec *codec)
 {
-        wm8731_set_bias_level(&wm8731->codec, SND_SOC_BIAS_OFF);
-        snd_soc_unregister_dai(&wm8731_dai);
-        snd_soc_unregister_codec(&wm8731->codec);
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+
+        wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+        regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
         regulator_bulk_free(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
-        kfree(wm8731);
-        wm8731_codec = NULL;
+
+        return 0;
 }
 
+static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
+        .probe =        wm8731_probe,
+        .remove =       wm8731_remove,
+        .suspend =      wm8731_suspend,
+        .resume =       wm8731_resume,
+        .set_bias_level = wm8731_set_bias_level,
+        .reg_cache_size = ARRAY_SIZE(wm8731_reg),
+        .reg_word_size = sizeof(u16),
+        .reg_cache_default = wm8731_reg,
+        .dapm_widgets = wm8731_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
+        .dapm_routes = wm8731_intercon,
+        .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8731_spi_probe(struct spi_device *spi)
 {
-        struct snd_soc_codec *codec;
         struct wm8731_priv *wm8731;
+        int ret;
 
         wm8731 = kzalloc(sizeof(struct wm8731_priv), GFP_KERNEL);
         if (wm8731 == NULL)
                 return -ENOMEM;
 
-        codec = &wm8731->codec;
-        codec->control_data = spi;
-        codec->dev = &spi->dev;
+        wm8731->control_type = SND_SOC_SPI;
+        spi_set_drvdata(spi, wm8731);
 
-        dev_set_drvdata(&spi->dev, wm8731);
-
-        return wm8731_register(wm8731, SND_SOC_SPI);
+        ret = snd_soc_register_codec(&spi->dev,
+                        &soc_codec_dev_wm8731, &wm8731_dai, 1);
+        if (ret < 0)
+                kfree(wm8731);
+        return ret;
 }
 
 static int __devexit wm8731_spi_remove(struct spi_device *spi)
 {
-        struct wm8731_priv *wm8731 = dev_get_drvdata(&spi->dev);
-
-        wm8731_unregister(wm8731);
-
+        snd_soc_unregister_codec(&spi->dev);
+        kfree(spi_get_drvdata(spi));
         return 0;
 }
 
 static struct spi_driver wm8731_spi_driver = {
         .driver = {
                 .name   = "wm8731",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = wm8731_spi_probe,
@@ -677,26 +649,26 @@ static __devinit int wm8731_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct wm8731_priv *wm8731;
-        struct snd_soc_codec *codec;
+        int ret;
 
         wm8731 = kzalloc(sizeof(struct wm8731_priv), GFP_KERNEL);
         if (wm8731 == NULL)
                 return -ENOMEM;
 
-        codec = &wm8731->codec;
-
         i2c_set_clientdata(i2c, wm8731);
-        codec->control_data = i2c;
+        wm8731->control_type = SND_SOC_I2C;
 
-        codec->dev = &i2c->dev;
-
-        return wm8731_register(wm8731, SND_SOC_I2C);
+        ret =  snd_soc_register_codec(&i2c->dev,
+                        &soc_codec_dev_wm8731, &wm8731_dai, 1);
+        if (ret < 0)
+                kfree(wm8731);
+        return ret;
 }
 
 static __devexit int wm8731_i2c_remove(struct i2c_client *client)
 {
-        struct wm8731_priv *wm8731 = i2c_get_clientdata(client);
-        wm8731_unregister(wm8731);
+        snd_soc_unregister_codec(&client->dev);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
@@ -719,7 +691,7 @@ static struct i2c_driver wm8731_i2c_driver = {
 
 static int __init wm8731_modinit(void)
 {
-        int ret;
+        int ret = 0;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         ret = i2c_add_driver(&wm8731_i2c_driver);
         if (ret != 0) {
@@ -734,7 +706,7 @@ static int __init wm8731_modinit(void)
                        ret);
         }
 #endif
-        return 0;
+        return ret;
 }
 module_init(wm8731_modinit);