From: Axel Lin <axel.lin@gmail.com>
To: alsa-devel@alsa-project.org
Cc: Peter Hsiang <peter.hsiang@maxim-ic.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>
Subject: [PATCH 05/14] ASoC: Convert max98095 to devm_kzalloc()
Date: Thu, 29 Dec 2011 12:02:21 +0800 [thread overview]
Message-ID: <1325131341.19977.8.camel@phoenix> (raw)
In-Reply-To: <1325130983.19977.2.camel@phoenix>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/max98095.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index c69dd02..fcfa749 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -2340,7 +2340,8 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
struct max98095_priv *max98095;
int ret;
- max98095 = kzalloc(sizeof(struct max98095_priv), GFP_KERNEL);
+ max98095 = devm_kzalloc(&i2c->dev, sizeof(struct max98095_priv),
+ GFP_KERNEL);
if (max98095 == NULL)
return -ENOMEM;
@@ -2350,16 +2351,12 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98095,
max98095_dai, ARRAY_SIZE(max98095_dai));
- if (ret < 0)
- kfree(max98095);
return ret;
}
static int __devexit max98095_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
- kfree(i2c_get_clientdata(client));
-
return 0;
}
--
1.7.5.4
next prev parent reply other threads:[~2011-12-29 4:02 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 ` Axel Lin [this message]
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 ` [PATCH 11/14] ASoC: Convert tlv320aic26 " Axel Lin
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=1325131341.19977.8.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@ti.com \
--cc=peter.hsiang@maxim-ic.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).