ASoC: Convert WM8940 to devm_kzalloc()

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

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index ffc123bc943b216b112e1fa47e8f60a71026c61c..ae1933ed3e071a75b194ec6428ebb9372584dea4 100644 (file)
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -749,7 +749,8 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c,
        struct wm8940_priv *wm8940;
        int ret;
 
-       wm8940 = kzalloc(sizeof(struct wm8940_priv), GFP_KERNEL);
+       wm8940 = devm_kzalloc(&i2c->dev, sizeof(struct wm8940_priv),
+                             GFP_KERNEL);
        if (wm8940 == NULL)
                return -ENOMEM;
 
@@ -758,15 +759,14 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8940, &wm8940_dai, 1);
-       if (ret < 0)
-               kfree(wm8940);
+
        return ret;
 }
 
 static __devexit int wm8940_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
+
        return 0;
 }