ASoC: wm8580: Convert to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 12 Sep 2012 01:25:59 +0000 (09:25 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 12 Sep 2012 01:36:44 +0000 (09:36 +0800)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8580.c

index 7c68226376e415a5e058bb10153531b68d49c990..cc198df15e6e7933f7512d5c21b81ecedead0ba3 100644 (file)
@@ -899,7 +899,8 @@ static int wm8580_i2c_probe(struct i2c_client *i2c,
        struct wm8580_priv *wm8580;
        int ret;
 
-       wm8580 = kzalloc(sizeof(struct wm8580_priv), GFP_KERNEL);
+       wm8580 = devm_kzalloc(&i2c->dev, sizeof(struct wm8580_priv),
+                             GFP_KERNEL);
        if (wm8580 == NULL)
                return -ENOMEM;
 
@@ -908,15 +909,13 @@ static int wm8580_i2c_probe(struct i2c_client *i2c,
 
        ret =  snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai));
-       if (ret < 0)
-               kfree(wm8580);
+
        return ret;
 }
 
 static int wm8580_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }