Merge branch 'master' into fixes

1 files changed, 14 insertions, 26 deletions

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index ca75a8180708..e4c50ce7d9c0 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -18,7 +18,6 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
-#include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
@@ -302,7 +301,7 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = {
         SND_SOC_DAPM_INPUT("RINPUT3"),
 };
 
-static const struct snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route wm8750_dapm_routes[] = {
         /* left mixer */
         {"Left Mixer", "Playback Switch", "Left DAC"},
         {"Left Mixer", "Left Bypass Switch", "Left Line Mux"},
@@ -396,17 +395,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"Right ADC", NULL, "Right ADC Mux"},
 };
 
-static int wm8750_add_widgets(struct snd_soc_codec *codec)
-{
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
-                                  ARRAY_SIZE(wm8750_dapm_widgets));
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-        return 0;
-}
-
 struct _coeff_div {
         u32 mclk;
         u32 rate;
@@ -643,7 +631,7 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec,
 #define WM8750_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
-static struct snd_soc_dai_ops wm8750_dai_ops = {
+static const struct snd_soc_dai_ops wm8750_dai_ops = {
         .hw_params      = wm8750_pcm_hw_params,
         .digital_mute   = wm8750_mute,
         .set_fmt        = wm8750_set_dai_fmt,
@@ -667,7 +655,7 @@ static struct snd_soc_dai_driver wm8750_dai = {
         .ops = &wm8750_dai_ops,
 };
 
-static int wm8750_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8750_suspend(struct snd_soc_codec *codec)
 {
         wm8750_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
@@ -709,9 +697,6 @@ static int wm8750_probe(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, WM8750_LINVOL, 0x0100, 0x0100);
         snd_soc_update_bits(codec, WM8750_RINVOL, 0x0100, 0x0100);
 
-        snd_soc_add_controls(codec, wm8750_snd_controls,
-                                ARRAY_SIZE(wm8750_snd_controls));
-        wm8750_add_widgets(codec);
         return ret;
 }
 
@@ -730,6 +715,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8750 = {
         .reg_cache_size = ARRAY_SIZE(wm8750_reg),
         .reg_word_size = sizeof(u16),
         .reg_cache_default = wm8750_reg,
+
+        .controls = wm8750_snd_controls,
+        .num_controls = ARRAY_SIZE(wm8750_snd_controls),
+        .dapm_widgets = wm8750_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
+        .dapm_routes = wm8750_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(wm8750_dapm_routes),
 };
 
 static const struct of_device_id wm8750_of_match[] = {
@@ -745,7 +737,8 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi)
         struct wm8750_priv *wm8750;
         int ret;
 
-        wm8750 = kzalloc(sizeof(struct wm8750_priv), GFP_KERNEL);
+        wm8750 = devm_kzalloc(&spi->dev, sizeof(struct wm8750_priv),
+                              GFP_KERNEL);
         if (wm8750 == NULL)
                 return -ENOMEM;
 
@@ -754,15 +747,12 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi)
 
         ret = snd_soc_register_codec(&spi->dev,
                         &soc_codec_dev_wm8750, &wm8750_dai, 1);
-        if (ret < 0)
-                kfree(wm8750);
         return ret;
 }
 
 static int __devexit wm8750_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
         return 0;
 }
 
@@ -792,7 +782,8 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c,
         struct wm8750_priv *wm8750;
         int ret;
 
-        wm8750 = kzalloc(sizeof(struct wm8750_priv), GFP_KERNEL);
+        wm8750 = devm_kzalloc(&i2c->dev, sizeof(struct wm8750_priv),
+                              GFP_KERNEL);
         if (wm8750 == NULL)
                 return -ENOMEM;
 
@@ -801,15 +792,12 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c,
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8750, &wm8750_dai, 1);
-        if (ret < 0)
-                kfree(wm8750);
         return ret;
 }
 
 static __devexit int wm8750_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }