Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ASoC: wm8988: Convert to devm_kzalloc()

Browse source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-01-21 23:25:16 +00:00
parent dd21353f35
commit 82fa367057
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sound/soc/codecs/wm8988.c
View file

@ -799,7 +799,8 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi)
struct wm8988_priv *wm8988; struct wm8988_priv *wm8988;
int ret; int ret;
wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL); wm8988 = devm_kzalloc(&spi->dev, sizeof(struct wm8988_priv),
GFP_KERNEL);
if (wm8988 == NULL) if (wm8988 == NULL)
return -ENOMEM; return -ENOMEM;
@ -808,15 +809,13 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi)
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8988, &wm8988_dai, 1); &soc_codec_dev_wm8988, &wm8988_dai, 1);
if (ret < 0)
kfree(wm8988);
return ret; return ret;
} }
static int __devexit wm8988_spi_remove(struct spi_device *spi) static int __devexit wm8988_spi_remove(struct spi_device *spi)
{ {
snd_soc_unregister_codec(&spi->dev); snd_soc_unregister_codec(&spi->dev);
kfree(spi_get_drvdata(spi));
return 0; return 0;
} }
@ -837,7 +836,8 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c,
struct wm8988_priv *wm8988; struct wm8988_priv *wm8988;
int ret; int ret;
wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL); wm8988 = devm_kzalloc(&i2c->dev, sizeof(struct wm8988_priv),
GFP_KERNEL);
if (wm8988 == NULL) if (wm8988 == NULL)
return -ENOMEM; return -ENOMEM;
@ -846,15 +846,12 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8988, &wm8988_dai, 1); &soc_codec_dev_wm8988, &wm8988_dai, 1);
if (ret < 0)
kfree(wm8988);
return ret; return ret;
} }
static __devexit int wm8988_i2c_remove(struct i2c_client *client) static __devexit int wm8988_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;
} }