ASoC: Convert tlv320aic3x to devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Thu, 29 Dec 2011 04:10:04 +0000 (12:10 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jan 2012 12:28:12 +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/tlv320aic3x.c

index 6f963c50e76eec26dd530b91ce2c015abf5cd2d1..492f22f8a4d7bd8ae30bbd2bb4ae6dae3488ccad 100644 (file)
@@ -1504,7 +1504,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
        struct aic3x_priv *aic3x;
        int ret;
 
-       aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL);
+       aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
        if (aic3x == NULL) {
                dev_err(&i2c->dev, "failed to create private data\n");
                return -ENOMEM;
@@ -1524,15 +1524,12 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_aic3x, &aic3x_dai, 1);
-       if (ret < 0)
-               kfree(aic3x);
        return ret;
 }
 
 static int aic3x_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }