Skip to content

Commit

Permalink
ASoC: Convert rt5631 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 Jan 2, 2012
1 parent bf791bd commit a92b0a0
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions sound/soc/codecs/rt5631.c
Original file line number Diff line number Diff line change
Expand Up @@ -1724,24 +1724,21 @@ static int rt5631_i2c_probe(struct i2c_client *i2c,
struct rt5631_priv *rt5631;
int ret;

rt5631 = kzalloc(sizeof(struct rt5631_priv), GFP_KERNEL);
rt5631 = devm_kzalloc(&i2c->dev, sizeof(struct rt5631_priv),
GFP_KERNEL);
if (NULL == rt5631)
return -ENOMEM;

i2c_set_clientdata(i2c, rt5631);

ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5631,
rt5631_dai, ARRAY_SIZE(rt5631_dai));
if (ret < 0)
kfree(rt5631);

return ret;
}

static __devexit int rt5631_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));
return 0;
}

Expand Down

0 comments on commit a92b0a0

Please sign in to comment.