Commit 512fa7c4 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown

ASoC: Convert sgtl5000 to use devm_kzalloc()

Convert sgtl5000 codec driver to use devm_kzalloc().
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cf1ee98d
...@@ -1401,7 +1401,8 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client, ...@@ -1401,7 +1401,8 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client,
struct sgtl5000_priv *sgtl5000; struct sgtl5000_priv *sgtl5000;
int ret; int ret;
sgtl5000 = kzalloc(sizeof(struct sgtl5000_priv), GFP_KERNEL); sgtl5000 = devm_kzalloc(&client->dev, sizeof(struct sgtl5000_priv),
GFP_KERNEL);
if (!sgtl5000) if (!sgtl5000)
return -ENOMEM; return -ENOMEM;
...@@ -1409,22 +1410,13 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client, ...@@ -1409,22 +1410,13 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client,
ret = snd_soc_register_codec(&client->dev, ret = snd_soc_register_codec(&client->dev,
&sgtl5000_driver, &sgtl5000_dai, 1); &sgtl5000_driver, &sgtl5000_dai, 1);
if (ret) {
dev_err(&client->dev, "Failed to register codec: %d\n", ret);
kfree(sgtl5000);
return ret; return ret;
}
return 0;
} }
static __devexit int sgtl5000_i2c_remove(struct i2c_client *client) static __devexit int sgtl5000_i2c_remove(struct i2c_client *client)
{ {
struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
kfree(sgtl5000);
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