1 files changed, 16 insertions, 19 deletions

diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index d3b0a20744f1..33e97d1d8f46 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -19,7 +19,6 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/of_device.h>
-#include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -328,14 +327,14 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec,
 #define WM8776_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
-static struct snd_soc_dai_ops wm8776_dac_ops = {
+static const struct snd_soc_dai_ops wm8776_dac_ops = {
         .digital_mute   = wm8776_mute,
         .hw_params      = wm8776_hw_params,
         .set_fmt        = wm8776_set_fmt,
         .set_sysclk     = wm8776_set_sysclk,
 };
 
-static struct snd_soc_dai_ops wm8776_adc_ops = {
+static const struct snd_soc_dai_ops wm8776_adc_ops = {
         .hw_params      = wm8776_hw_params,
         .set_fmt        = wm8776_set_fmt,
         .set_sysclk     = wm8776_set_sysclk,
@@ -373,7 +372,7 @@ static struct snd_soc_dai_driver wm8776_dai[] = {
 };
 
 #ifdef CONFIG_PM
-static int wm8776_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8776_suspend(struct snd_soc_codec *codec)
 {
         wm8776_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
@@ -393,7 +392,6 @@ static int wm8776_resume(struct snd_soc_codec *codec)
 static int wm8776_probe(struct snd_soc_codec *codec)
 {
         struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret = 0;
 
         ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type);
@@ -415,12 +413,6 @@ static int wm8776_probe(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, WM8776_HPRVOL, 0x100, 0x100);
         snd_soc_update_bits(codec, WM8776_DACRVOL, 0x100, 0x100);
 
-        snd_soc_add_controls(codec, wm8776_snd_controls,
-                             ARRAY_SIZE(wm8776_snd_controls));
-        snd_soc_dapm_new_controls(dapm, wm8776_dapm_widgets,
-                                  ARRAY_SIZE(wm8776_dapm_widgets));
-        snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes));
-
         return ret;
 }
 
@@ -440,6 +432,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8776 = {
         .reg_cache_size = ARRAY_SIZE(wm8776_reg),
         .reg_word_size = sizeof(u16),
         .reg_cache_default = wm8776_reg,
+
+        .controls = wm8776_snd_controls,
+        .num_controls = ARRAY_SIZE(wm8776_snd_controls),
+        .dapm_widgets = wm8776_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets),
+        .dapm_routes = routes,
+        .num_dapm_routes = ARRAY_SIZE(routes),
 };
 
 static const struct of_device_id wm8776_of_match[] = {
@@ -454,7 +453,8 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi)
         struct wm8776_priv *wm8776;
         int ret;
 
-        wm8776 = kzalloc(sizeof(struct wm8776_priv), GFP_KERNEL);
+        wm8776 = devm_kzalloc(&spi->dev, sizeof(struct wm8776_priv),
+                              GFP_KERNEL);
         if (wm8776 == NULL)
                 return -ENOMEM;
 
@@ -463,15 +463,13 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi)
 
         ret = snd_soc_register_codec(&spi->dev,
                         &soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai));
-        if (ret < 0)
-                kfree(wm8776);
+
         return ret;
 }
 
 static int __devexit wm8776_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
         return 0;
 }
 
@@ -493,7 +491,8 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,
         struct wm8776_priv *wm8776;
         int ret;
 
-        wm8776 = kzalloc(sizeof(struct wm8776_priv), GFP_KERNEL);
+        wm8776 = devm_kzalloc(&i2c->dev, sizeof(struct wm8776_priv),
+                              GFP_KERNEL);
         if (wm8776 == NULL)
                 return -ENOMEM;
 
@@ -502,15 +501,13 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai));
-        if (ret < 0)
-                kfree(wm8776);
+
         return ret;
 }
 
 static __devexit int wm8776_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }