ASoC: Convert tlv320aic32x4 to devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Mon, 26 Dec 2011 12:57:24 +0000 (20:57 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Dec 2011 17:22:41 +0000 (17:22 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/tlv320aic32x4.c

index 81a26e1090b31d00e76a1e1dd486c96620ac8506..eb401ef021fb7130055d8c73d9385d19daada0ff 100644 (file)
@@ -709,7 +709,8 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c,
        struct aic32x4_priv *aic32x4;
        int ret;
 
-       aic32x4 = kzalloc(sizeof(struct aic32x4_priv), GFP_KERNEL);
+       aic32x4 = devm_kzalloc(&i2c->dev, sizeof(struct aic32x4_priv),
+                              GFP_KERNEL);
        if (aic32x4 == NULL)
                return -ENOMEM;
 
@@ -728,15 +729,12 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_aic32x4, &aic32x4_dai, 1);
-       if (ret < 0)
-               kfree(aic32x4);
        return ret;
 }
 
 static __devexit int aic32x4_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }