From: Axel Lin Date: Mon, 26 Dec 2011 12:50:02 +0000 (+0800) Subject: ASoC: Convert ad1836 to devm_kzalloc() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e4f17cb2b7e8a5327ccc5a6a32442acd408c190;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ASoC: Convert ad1836 to devm_kzalloc() Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index 919322daf6dd..982d201c2e86 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c @@ -341,7 +341,8 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi) struct ad1836_priv *ad1836; int ret; - ad1836 = kzalloc(sizeof(struct ad1836_priv), GFP_KERNEL); + ad1836 = devm_kzalloc(&spi->dev, sizeof(struct ad1836_priv), + GFP_KERNEL); if (ad1836 == NULL) return -ENOMEM; @@ -351,17 +352,15 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi) ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_ad1836, &ad183x_dais[ad1836->type], 1); - if (ret < 0) - kfree(ad1836); return ret; } static int __devexit ad1836_spi_remove(struct spi_device *spi) { snd_soc_unregister_codec(&spi->dev); - kfree(spi_get_drvdata(spi)); return 0; } + static const struct spi_device_id ad1836_ids[] = { { "ad1835", AD1835 }, { "ad1836", AD1836 },