forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: Convert WM8955 to devm_kzalloc()

Browse source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-12-29 21:23:04 +00:00
commit ba5c88d02d
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sound/soc/codecs/wm8955.c
View file

@ -1007,7 +1007,8 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
struct wm8955_priv *wm8955; struct wm8955_priv *wm8955;
int ret; int ret;
wm8955 = kzalloc(sizeof(struct wm8955_priv), GFP_KERNEL); wm8955 = devm_kzalloc(&i2c->dev, sizeof(struct wm8955_priv),
GFP_KERNEL);
if (wm8955 == NULL) if (wm8955 == NULL)
return -ENOMEM; return -ENOMEM;
@ -1016,15 +1017,13 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8955, &wm8955_dai, 1); &soc_codec_dev_wm8955, &wm8955_dai, 1);
if (ret < 0)
kfree(wm8955);
return ret; return ret;
} }
static __devexit int wm8955_i2c_remove(struct i2c_client *client) static __devexit int wm8955_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;
} }