Commit 021b918e authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Convert cs42l51 to devm_kzalloc()

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 24b6f263
...@@ -577,7 +577,8 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client, ...@@ -577,7 +577,8 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
dev_info(&i2c_client->dev, "found device cs42l51 rev %d\n", dev_info(&i2c_client->dev, "found device cs42l51 rev %d\n",
ret & 7); ret & 7);
cs42l51 = kzalloc(sizeof(struct cs42l51_private), GFP_KERNEL); cs42l51 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l51_private),
GFP_KERNEL);
if (!cs42l51) { if (!cs42l51) {
dev_err(&i2c_client->dev, "could not allocate codec\n"); dev_err(&i2c_client->dev, "could not allocate codec\n");
return -ENOMEM; return -ENOMEM;
...@@ -588,18 +589,13 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client, ...@@ -588,18 +589,13 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
ret = snd_soc_register_codec(&i2c_client->dev, ret = snd_soc_register_codec(&i2c_client->dev,
&soc_codec_device_cs42l51, &cs42l51_dai, 1); &soc_codec_device_cs42l51, &cs42l51_dai, 1);
if (ret < 0)
kfree(cs42l51);
error: error:
return ret; return ret;
} }
static int cs42l51_i2c_remove(struct i2c_client *client) static int cs42l51_i2c_remove(struct i2c_client *client)
{ {
struct cs42l51_private *cs42l51 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
kfree(cs42l51);
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