Commit 7fd8a674 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Convert cs4270 to devm_kzalloc()

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 360b70ca
...@@ -671,7 +671,8 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, ...@@ -671,7 +671,8 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
i2c_client->addr); i2c_client->addr);
dev_info(&i2c_client->dev, "hardware revision %X\n", ret & 0xF); dev_info(&i2c_client->dev, "hardware revision %X\n", ret & 0xF);
cs4270 = kzalloc(sizeof(struct cs4270_private), GFP_KERNEL); cs4270 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs4270_private),
GFP_KERNEL);
if (!cs4270) { if (!cs4270) {
dev_err(&i2c_client->dev, "could not allocate codec\n"); dev_err(&i2c_client->dev, "could not allocate codec\n");
return -ENOMEM; return -ENOMEM;
...@@ -682,8 +683,6 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, ...@@ -682,8 +683,6 @@ static int cs4270_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_cs4270, &cs4270_dai, 1); &soc_codec_device_cs4270, &cs4270_dai, 1);
if (ret < 0)
kfree(cs4270);
return ret; return ret;
} }
...@@ -696,7 +695,6 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, ...@@ -696,7 +695,6 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
static int cs4270_i2c_remove(struct i2c_client *i2c_client) static int cs4270_i2c_remove(struct i2c_client *i2c_client)
{ {
snd_soc_unregister_codec(&i2c_client->dev); snd_soc_unregister_codec(&i2c_client->dev);
kfree(i2c_get_clientdata(i2c_client));
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