]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: Convert ak4641 to devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Tue, 20 Dec 2011 06:39:20 +0000 (14:39 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 10:13:58 +0000 (10:13 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/ak4641.c

index 90184701480d64d78fb973fa35cf1ebcca9c8336..266ebea2b65af30ccde122b48263f7b167889204 100644 (file)
@@ -602,7 +602,8 @@ static int __devinit ak4641_i2c_probe(struct i2c_client *i2c,
        struct ak4641_priv *ak4641;
        int ret;
 
-       ak4641 = kzalloc(sizeof(struct ak4641_priv), GFP_KERNEL);
+       ak4641 = devm_kzalloc(&i2c->dev, sizeof(struct ak4641_priv),
+                             GFP_KERNEL);
        if (!ak4641)
                return -ENOMEM;
 
@@ -610,16 +611,12 @@ static int __devinit ak4641_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ak4641,
                                ak4641_dai, ARRAY_SIZE(ak4641_dai));
-       if (ret < 0)
-               kfree(ak4641);
-
        return ret;
 }
 
 static int __devexit ak4641_i2c_remove(struct i2c_client *i2c)
 {
        snd_soc_unregister_codec(&i2c->dev);
-       kfree(i2c_get_clientdata(i2c));
        return 0;
 }