Commit 3025ae45 authored by Mark Brown's avatar Mark Brown

ASoC: Convert wm8770 to devm_kzalloc()

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7fcadfd1
...@@ -695,7 +695,8 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi) ...@@ -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) ...@@ -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;
} }
......
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