ASoC: wm8988: Convert to devm_kzalloc()

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

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 40aebafb35e6f6a81649b47c7b4090989ff0bcce..4ef9d4cb7d7c91af470da8e911d1641a692fb1c7 100644 (file)
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -799,7 +799,8 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi)
        struct wm8988_priv *wm8988;
        int ret;
 
-       wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL);
+       wm8988 = devm_kzalloc(&spi->dev, sizeof(struct wm8988_priv),
+                             GFP_KERNEL);
        if (wm8988 == NULL)
                return -ENOMEM;
 
@@ -808,15 +809,13 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                        &soc_codec_dev_wm8988, &wm8988_dai, 1);
-       if (ret < 0)
-               kfree(wm8988);
+
        return ret;
 }
 
 static int __devexit wm8988_spi_remove(struct spi_device *spi)
 {
        snd_soc_unregister_codec(&spi->dev);
-       kfree(spi_get_drvdata(spi));
        return 0;
 }
 
@@ -837,7 +836,8 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c,
        struct wm8988_priv *wm8988;
        int ret;
 
-       wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL);
+       wm8988 = devm_kzalloc(&i2c->dev, sizeof(struct wm8988_priv),
+                             GFP_KERNEL);
        if (wm8988 == NULL)
                return -ENOMEM;
 
@@ -846,15 +846,12 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c,
 
        ret =  snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8988, &wm8988_dai, 1);
-       if (ret < 0)
-               kfree(wm8988);
        return ret;
 }
 
 static __devexit int wm8988_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }