evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: Convert tlv320aic32x4 to devm_kzalloc()

Browse source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-26 20:57:24 +08:00 • committed by Mark Brown
parent 558460c65a
commit 658ecf7784
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/codecs/tlv320aic32x4.c
View file

@ -709,7 +709,8 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c,
struct aic32x4_priv *aic32x4; struct aic32x4_priv *aic32x4;
int ret; int ret;
aic32x4 = kzalloc(sizeof(struct aic32x4_priv), GFP_KERNEL); aic32x4 = devm_kzalloc(&i2c->dev, sizeof(struct aic32x4_priv),
GFP_KERNEL);
if (aic32x4 == NULL) if (aic32x4 == NULL)
return -ENOMEM; return -ENOMEM;
@ -728,15 +729,12 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_aic32x4, &aic32x4_dai, 1); &soc_codec_dev_aic32x4, &aic32x4_dai, 1);
if (ret < 0)
kfree(aic32x4);
return ret; return ret;
} }
static __devexit int aic32x4_i2c_remove(struct i2c_client *client) static __devexit int aic32x4_i2c_remove(struct i2c_client *client)
{ {
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));
return 0; return 0;
} }