ASoC: wm8728: Convert to devm_kzalloc()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 1467f97dce21efa668b005a531faf3a64bfd78c2..f274c250d492ae07274daa8ef0a796f2c82d979e 100644 (file)
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -280,7 +280,8 @@ static int __devinit wm8728_spi_probe(struct spi_device *spi)
        struct wm8728_priv *wm8728;
        int ret;
 
-       wm8728 = kzalloc(sizeof(struct wm8728_priv), GFP_KERNEL);
+       wm8728 = devm_kzalloc(&spi->dev, sizeof(struct wm8728_priv),
+                             GFP_KERNEL);
        if (wm8728 == NULL)
                return -ENOMEM;
 
@@ -289,15 +290,14 @@ static int __devinit wm8728_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                        &soc_codec_dev_wm8728, &wm8728_dai, 1);
-       if (ret < 0)
-               kfree(wm8728);
+
        return ret;
 }
 
 static int __devexit wm8728_spi_remove(struct spi_device *spi)
 {
        snd_soc_unregister_codec(&spi->dev);
-       kfree(spi_get_drvdata(spi));
+
        return 0;
 }
 
@@ -319,7 +319,8 @@ static __devinit int wm8728_i2c_probe(struct i2c_client *i2c,
        struct wm8728_priv *wm8728;
        int ret;
 
-       wm8728 = kzalloc(sizeof(struct wm8728_priv), GFP_KERNEL);
+       wm8728 = devm_kzalloc(&i2c->dev, sizeof(struct wm8728_priv),
+                             GFP_KERNEL);
        if (wm8728 == NULL)
                return -ENOMEM;
 
@@ -328,15 +329,13 @@ static __devinit int wm8728_i2c_probe(struct i2c_client *i2c,
 
        ret =  snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8728, &wm8728_dai, 1);
-       if (ret < 0)
-               kfree(wm8728);
+
        return ret;
 }
 
 static __devexit int wm8728_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }