Commit 3922d518 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Convert ak4104 to devm_kzalloc()

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 07cdf36d
...@@ -261,7 +261,8 @@ static int ak4104_spi_probe(struct spi_device *spi) ...@@ -261,7 +261,8 @@ static int ak4104_spi_probe(struct spi_device *spi)
if (ret < 0) if (ret < 0)
return ret; return ret;
ak4104 = kzalloc(sizeof(struct ak4104_private), GFP_KERNEL); ak4104 = devm_kzalloc(&spi->dev, sizeof(struct ak4104_private),
GFP_KERNEL);
if (ak4104 == NULL) if (ak4104 == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -271,15 +272,12 @@ static int ak4104_spi_probe(struct spi_device *spi) ...@@ -271,15 +272,12 @@ static int ak4104_spi_probe(struct spi_device *spi)
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_device_ak4104, &ak4104_dai, 1); &soc_codec_device_ak4104, &ak4104_dai, 1);
if (ret < 0)
kfree(ak4104);
return ret; return ret;
} }
static int __devexit ak4104_spi_remove(struct spi_device *spi) static int __devexit ak4104_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