ASoC: Convert cs42l51 to devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Thu, 29 Dec 2011 04:00:13 +0000 (12:00 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jan 2012 12:28:11 +0000 (12:28 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/cs42l51.c

index ffce9f2a6643cf4770fd3e113441d9901a066ee5..a8bf588e8740ee248e039bf4028f346383bd9f4a 100644 (file)
@@ -577,7 +577,8 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
        dev_info(&i2c_client->dev, "found device cs42l51 rev %d\n",
                                ret & 7);
 
-       cs42l51 = kzalloc(sizeof(struct cs42l51_private), GFP_KERNEL);
+       cs42l51 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l51_private),
+                              GFP_KERNEL);
        if (!cs42l51) {
                dev_err(&i2c_client->dev, "could not allocate codec\n");
                return -ENOMEM;
@@ -588,18 +589,13 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
 
        ret =  snd_soc_register_codec(&i2c_client->dev,
                        &soc_codec_device_cs42l51, &cs42l51_dai, 1);
-       if (ret < 0)
-               kfree(cs42l51);
 error:
        return ret;
 }
 
 static int cs42l51_i2c_remove(struct i2c_client *client)
 {
-       struct cs42l51_private *cs42l51 = i2c_get_clientdata(client);
-
        snd_soc_unregister_codec(&client->dev);
-       kfree(cs42l51);
        return 0;
 }