alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: alsa-devel@alsa-project.org
Cc: Lars-Peter Clausen <lars@metafoo.de>,
	Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>,
	Mark@alsa-project.org
Subject: [PATCH 02/10] ASoC: Convert ad1836 to devm_kzalloc()
Date: Mon, 26 Dec 2011 20:50:02 +0800	[thread overview]
Message-ID: <1324903802.26543.2.camel@phoenix> (raw)
In-Reply-To: <1324903728.26543.1.camel@phoenix>

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/soc/codecs/ad1836.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index 919322d..982d201 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 },
-- 
1.7.5.4

  reply	other threads:[~2011-12-26 12:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-26 12:48 [PATCH 01/10] ASoC: Convert 88pm860x-codec to devm_kzalloc() Axel Lin
2011-12-26 12:50 ` Axel Lin [this message]
2011-12-28 17:22   ` [PATCH 02/10] ASoC: Convert ad1836 " Mark Brown
2011-12-26 12:51 ` [PATCH 03/10] ASoC: Convert ad193x " Axel Lin
2011-12-26 12:52 ` [PATCH 04/10] ASoC: Convert adau1373 " Axel Lin
2011-12-26 12:53 ` [PATCH 05/10] ASoC: Convert adau1701 " Axel Lin
2011-12-26 12:54 ` [PATCH 06/10] ASoC: Convert da7210 " Axel Lin
2011-12-27 12:58   ` Mark Brown
2011-12-26 12:55 ` [PATCH 07/10] ASoC: Convert jz4740 " Axel Lin
2011-12-26 12:56 ` [PATCH 08/10] ASoC: Convert lm4857 " Axel Lin
2011-12-27 12:59   ` Mark Brown
2011-12-26 12:57 ` [PATCH 09/10] ASoC: Convert tlv320aic32x4 " Axel Lin
2011-12-26 12:58 ` [PATCH 10/10] ASoC: Convert uda1380 " Axel Lin
2011-12-27 12:59   ` Mark Brown
2011-12-27 12:58 ` [PATCH 01/10] ASoC: Convert 88pm860x-codec " Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324903802.26543.2.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=Mark@alsa-project.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=lars@metafoo.de \
    --cc=lrg@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).