ASoC: Convert sgtl5000 to use devm_kzalloc()
authorFabio Estevam <festevam@gmail.com>
Wed, 28 Dec 2011 13:30:11 +0000 (11:30 -0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Dec 2011 17:20:20 +0000 (17:20 +0000)
Convert sgtl5000 codec driver to use devm_kzalloc().

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/sgtl5000.c

index 827a43bec531c58ac0159e7387969f2364ef6e13..fc9b127206e274350ae35dbf3621b4a7530d5f26 100644 (file)
@@ -1401,7 +1401,8 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client,
        struct sgtl5000_priv *sgtl5000;
        int ret;
 
-       sgtl5000 = kzalloc(sizeof(struct sgtl5000_priv), GFP_KERNEL);
+       sgtl5000 = devm_kzalloc(&client->dev, sizeof(struct sgtl5000_priv),
+                                                               GFP_KERNEL);
        if (!sgtl5000)
                return -ENOMEM;
 
@@ -1409,22 +1410,13 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client,
 
        ret = snd_soc_register_codec(&client->dev,
                        &sgtl5000_driver, &sgtl5000_dai, 1);
-       if (ret) {
-               dev_err(&client->dev, "Failed to register codec: %d\n", ret);
-               kfree(sgtl5000);
-               return ret;
-       }
-
-       return 0;
+       return ret;
 }
 
 static __devexit int sgtl5000_i2c_remove(struct i2c_client *client)
 {
-       struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client);
-
        snd_soc_unregister_codec(&client->dev);
 
-       kfree(sgtl5000);
        return 0;
 }