ASoC: wm8985: Convert to devm_kzalloc()

[deliverable/linux.git] / sound / soc / codecs / wm8985.c

diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index bae510acdec8facfa985a966173c0512a92e8783..e62a4c55a9c363cfe5554978bc25efcca3b754c9 100644 (file)
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -411,7 +411,8 @@ static const struct snd_soc_dapm_widget wm8985_dapm_widgets[] = {
        SND_SOC_DAPM_PGA("Right Speaker Out", WM8985_POWER_MANAGEMENT_3,
                6, 0, NULL, 0),
 
-       SND_SOC_DAPM_MICBIAS("Mic Bias", WM8985_POWER_MANAGEMENT_1, 4, 0),
+       SND_SOC_DAPM_SUPPLY("Mic Bias", WM8985_POWER_MANAGEMENT_1, 4, 0,
+                           NULL, 0),
 
        SND_SOC_DAPM_INPUT("LIN"),
        SND_SOC_DAPM_INPUT("LIP"),
@@ -944,7 +945,7 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_PM
-static int wm8985_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8985_suspend(struct snd_soc_codec *codec)
 {
        wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;
@@ -1030,7 +1031,7 @@ err_reg_get:
        return ret;
 }
 
-static struct snd_soc_dai_ops wm8985_dai_ops = {
+static const struct snd_soc_dai_ops wm8985_dai_ops = {
        .digital_mute = wm8985_dac_mute,
        .hw_params = wm8985_hw_params,
        .set_fmt = wm8985_set_fmt,
@@ -1078,7 +1079,7 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
        struct wm8985_priv *wm8985;
        int ret;
 
-       wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);
+       wm8985 = devm_kzalloc(&spi->dev, sizeof *wm8985, GFP_KERNEL);
        if (!wm8985)
                return -ENOMEM;
 
@@ -1087,15 +1088,12 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                                     &soc_codec_dev_wm8985, &wm8985_dai, 1);
-       if (ret < 0)
-               kfree(wm8985);
        return ret;
 }
 
 static int __devexit wm8985_spi_remove(struct spi_device *spi)
 {
        snd_soc_unregister_codec(&spi->dev);
-       kfree(spi_get_drvdata(spi));
        return 0;
 }
 
@@ -1116,7 +1114,7 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
        struct wm8985_priv *wm8985;
        int ret;
 
-       wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);
+       wm8985 = devm_kzalloc(&i2c->dev, sizeof *wm8985, GFP_KERNEL);
        if (!wm8985)
                return -ENOMEM;
 
@@ -1125,15 +1123,12 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                                     &soc_codec_dev_wm8985, &wm8985_dai, 1);
-       if (ret < 0)
-               kfree(wm8985);
        return ret;
 }
 
 static __devexit int wm8985_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }