ASoC: wm8983: Convert to devm_kzalloc()

[karo-tx-linux.git] / sound / soc / codecs / wm8983.c

diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index 367388fdc486484202e4bb550420bdcda31a8fdf..57c33fc19681b17baa7549b48b47e6fd88cef025 100644 (file)
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -1085,7 +1085,7 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi)
        struct wm8983_priv *wm8983;
        int ret;
 
-       wm8983 = kzalloc(sizeof *wm8983, GFP_KERNEL);
+       wm8983 = devm_kzalloc(&spi->dev, sizeof *wm8983, GFP_KERNEL);
        if (!wm8983)
                return -ENOMEM;
 
@@ -1094,15 +1094,12 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                                     &soc_codec_dev_wm8983, &wm8983_dai, 1);
-       if (ret < 0)
-               kfree(wm8983);
        return ret;
 }
 
 static int __devexit wm8983_spi_remove(struct spi_device *spi)
 {
        snd_soc_unregister_codec(&spi->dev);
-       kfree(spi_get_drvdata(spi));
        return 0;
 }
 
@@ -1123,7 +1120,7 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c,
        struct wm8983_priv *wm8983;
        int ret;
 
-       wm8983 = kzalloc(sizeof *wm8983, GFP_KERNEL);
+       wm8983 = devm_kzalloc(&i2c->dev, sizeof *wm8983, GFP_KERNEL);
        if (!wm8983)
                return -ENOMEM;
 
@@ -1132,15 +1129,13 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                                     &soc_codec_dev_wm8983, &wm8983_dai, 1);
-       if (ret < 0)
-               kfree(wm8983);
+
        return ret;
 }
 
 static __devexit int wm8983_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }