Skip to content

Commit

Permalink
ASoC: Convert lm4857 to devm_kzalloc()
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Dec 27, 2011
1 parent 306bf6b commit eb3bb97
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions sound/soc/codecs/lm4857.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ static int __devinit lm4857_i2c_probe(struct i2c_client *i2c,
struct lm4857 *lm4857;
int ret;

lm4857 = kzalloc(sizeof(*lm4857), GFP_KERNEL);
lm4857 = devm_kzalloc(&i2c->dev, sizeof(*lm4857), GFP_KERNEL);
if (!lm4857)
return -ENOMEM;

Expand All @@ -225,21 +225,12 @@ static int __devinit lm4857_i2c_probe(struct i2c_client *i2c,

ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_lm4857, NULL, 0);

if (ret) {
kfree(lm4857);
return ret;
}

return 0;
return ret;
}

static int __devexit lm4857_i2c_remove(struct i2c_client *i2c)
{
struct lm4857 *lm4857 = i2c_get_clientdata(i2c);

snd_soc_unregister_codec(&i2c->dev);
kfree(lm4857);

return 0;
}

Expand Down

0 comments on commit eb3bb97

Please sign in to comment.