ASoC: Convert wm8961 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
69be6660f3
commit
2ec2a9061d
1 changed files with 4 additions and 4 deletions
|
@ -1087,7 +1087,8 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
|
||||||
struct wm8961_priv *wm8961;
|
struct wm8961_priv *wm8961;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
wm8961 = kzalloc(sizeof(struct wm8961_priv), GFP_KERNEL);
|
wm8961 = devm_kzalloc(&i2c->dev, sizeof(struct wm8961_priv),
|
||||||
|
GFP_KERNEL);
|
||||||
if (wm8961 == NULL)
|
if (wm8961 == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -1095,15 +1096,14 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
|
||||||
|
|
||||||
ret = snd_soc_register_codec(&i2c->dev,
|
ret = snd_soc_register_codec(&i2c->dev,
|
||||||
&soc_codec_dev_wm8961, &wm8961_dai, 1);
|
&soc_codec_dev_wm8961, &wm8961_dai, 1);
|
||||||
if (ret < 0)
|
|
||||||
kfree(wm8961);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __devexit int wm8961_i2c_remove(struct i2c_client *client)
|
static __devexit int wm8961_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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in a new issue