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: Grant Likely <grant.likely@secretlab.ca>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>
Subject: [PATCH 11/14] ASoC: Convert tlv320aic26 to devm_kzalloc()
Date: Thu, 29 Dec 2011 12:08:36 +0800	[thread overview]
Message-ID: <1325131716.19977.15.camel@phoenix> (raw)
In-Reply-To: <1325130983.19977.2.camel@phoenix>

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

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 86d1fa3..a038dae 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -416,7 +416,7 @@ static int aic26_spi_probe(struct spi_device *spi)
 	dev_dbg(&spi->dev, "probing tlv320aic26 spi device\n");
 
 	/* Allocate driver data */
-	aic26 = kzalloc(sizeof *aic26, GFP_KERNEL);
+	aic26 = devm_kzalloc(&spi->dev, sizeof *aic26, GFP_KERNEL);
 	if (!aic26)
 		return -ENOMEM;
 
@@ -427,18 +427,12 @@ static int aic26_spi_probe(struct spi_device *spi)
 
 	ret = snd_soc_register_codec(&spi->dev,
 			&aic26_soc_codec_dev, &aic26_dai, 1);
-	if (ret < 0)
-		kfree(aic26);
 	return ret;
-
-	dev_dbg(&spi->dev, "SPI device initialized\n");
-	return 0;
 }
 
 static int aic26_spi_remove(struct spi_device *spi)
 {
 	snd_soc_unregister_codec(&spi->dev);
-	kfree(spi_get_drvdata(spi));
 	return 0;
 }
 
-- 
1.7.5.4

  parent reply	other threads:[~2011-12-29  4:08 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-29  3:56 [PATCH 01/14] ASoC: Convert alc5623 to devm_kzalloc() Axel Lin
2011-12-29  3:58 ` [PATCH 02/14] ASoC: Convert cs4270 " Axel Lin
2011-12-29 15:52   ` Tabi Timur-B04825
2011-12-29 18:17     ` Mark Brown
2011-12-29 18:49       ` Tabi Timur-B04825
2011-12-29  4:00 ` [PATCH 03/14] ASoC: Convert cs42l51 " Axel Lin
2011-12-29  4:01 ` [PATCH 04/14] ASoC: Convert max98088 " Axel Lin
2011-12-29  4:02 ` [PATCH 05/14] ASoC: Convert max98095 " Axel Lin
2011-12-29  4:03 ` [PATCH 06/14] ASoC: Convert max9850 " Axel Lin
2011-12-29  4:04 ` [PATCH 07/14] ASoC: Convert rt5631 " Axel Lin
2011-12-29  4:05 ` [PATCH 08/14] ASoC: Convert ssm2602 " Axel Lin
2011-12-29  4:06 ` [PATCH 09/14] ASoC: Convert sta32x " Axel Lin
2011-12-29  4:07 ` [PATCH 10/14] ASoC: Convert tlv320aic23 " Axel Lin
2011-12-29  4:08 ` Axel Lin [this message]
2011-12-29  4:10 ` [PATCH 12/14] ASoC: Convert tlv320aic3x " Axel Lin
2011-12-29  4:11 ` [PATCH 13/14] ASoC: Convert tlv320dac33 " Axel Lin
2011-12-29  4:12 ` [PATCH 14/14] ASoC: Convert tpa6130a2 " Axel Lin
2012-01-02 12:29 ` [PATCH 01/14] ASoC: Convert alc5623 " 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=1325131716.19977.15.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=grant.likely@secretlab.ca \
    --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).