Commit 6ce91ad4 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Convert uda1380 to devm_kzalloc()

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent eb3bb97c
...@@ -803,7 +803,8 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, ...@@ -803,7 +803,8 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c,
struct uda1380_priv *uda1380; struct uda1380_priv *uda1380;
int ret; int ret;
uda1380 = kzalloc(sizeof(struct uda1380_priv), GFP_KERNEL); uda1380 = devm_kzalloc(&i2c->dev, sizeof(struct uda1380_priv),
GFP_KERNEL);
if (uda1380 == NULL) if (uda1380 == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -812,15 +813,12 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, ...@@ -812,15 +813,12 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_uda1380, uda1380_dai, ARRAY_SIZE(uda1380_dai)); &soc_codec_dev_uda1380, uda1380_dai, ARRAY_SIZE(uda1380_dai));
if (ret < 0)
kfree(uda1380);
return ret; return ret;
} }
static int __devexit uda1380_i2c_remove(struct i2c_client *i2c) static int __devexit uda1380_i2c_remove(struct i2c_client *i2c)
{ {
snd_soc_unregister_codec(&i2c->dev); snd_soc_unregister_codec(&i2c->dev);
kfree(i2c_get_clientdata(i2c));
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment