niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: Convert wm8770 to devm_kzalloc()

Browse source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-12-08 16:24:16 +08:00
parent 7fcadfd176
commit 3025ae45d6
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -695,7 +695,8 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi)
struct wm8770_priv *wm8770; struct wm8770_priv *wm8770;
int ret; int ret;
wm8770 = kzalloc(sizeof(struct wm8770_priv), GFP_KERNEL); wm8770 = devm_kzalloc(&spi->dev, sizeof(struct wm8770_priv),
GFP_KERNEL);
if (!wm8770) if (!wm8770)
return -ENOMEM; return -ENOMEM;
@ -704,15 +705,13 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi)
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8770, &wm8770_dai, 1); &soc_codec_dev_wm8770, &wm8770_dai, 1);
if (ret < 0)
kfree(wm8770);
return ret; return ret;
} }
static int __devexit wm8770_spi_remove(struct spi_device *spi) static int __devexit wm8770_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;
} }