Commit b9791c01 authored by Mark Brown's avatar Mark Brown

ASoC: Convert WM8960 to devm_kzalloc()

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 1eb0202d
...@@ -973,7 +973,8 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, ...@@ -973,7 +973,8 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
struct wm8960_priv *wm8960; struct wm8960_priv *wm8960;
int ret; int ret;
wm8960 = kzalloc(sizeof(struct wm8960_priv), GFP_KERNEL); wm8960 = devm_kzalloc(&i2c->dev, sizeof(struct wm8960_priv),
GFP_KERNEL);
if (wm8960 == NULL) if (wm8960 == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -982,15 +983,13 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, ...@@ -982,15 +983,13 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8960, &wm8960_dai, 1); &soc_codec_dev_wm8960, &wm8960_dai, 1);
if (ret < 0)
kfree(wm8960);
return ret; return ret;
} }
static __devexit int wm8960_i2c_remove(struct i2c_client *client) static __devexit int wm8960_i2c_remove(struct i2c_client *client)
{ {
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(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