| From de89e5feef647f18b97650663538b91a7c11754c Mon Sep 17 00:00:00 2001 |
| From: Axel Lin <axel.lin@gmail.com> |
| Date: Tue, 20 Dec 2011 14:40:12 +0800 |
| Subject: ASoC: Convert ak4642 to devm_kzalloc() |
| |
| Signed-off-by: Axel Lin <axel.lin@gmail.com> |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| (cherry picked from commit 2ff49eea9b8a1d92c2ab09d803dfdc06f4f8e74b) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| sound/soc/codecs/ak4642.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c |
| index a04eebf..2cdcea2 100644 |
| --- a/sound/soc/codecs/ak4642.c |
| +++ b/sound/soc/codecs/ak4642.c |
| @@ -525,7 +525,8 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, |
| struct ak4642_priv *ak4642; |
| int ret; |
| |
| - ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL); |
| + ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv), |
| + GFP_KERNEL); |
| if (!ak4642) |
| return -ENOMEM; |
| |
| @@ -535,15 +536,12 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, |
| ret = snd_soc_register_codec(&i2c->dev, |
| (struct snd_soc_codec_driver *)id->driver_data, |
| &ak4642_dai, 1); |
| - if (ret < 0) |
| - kfree(ak4642); |
| return ret; |
| } |
| |
| static __devexit int ak4642_i2c_remove(struct i2c_client *client) |
| { |
| snd_soc_unregister_codec(&client->dev); |
| - kfree(i2c_get_clientdata(client)); |
| return 0; |
| } |
| |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |
