aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8904.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-29 15:05:00 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 08:58:23 -0500
commit93e26d4e44e65ef803ea35cfd0fe14fd8af49cb0 (patch)
tree44c82980981d4e6c61660b6acc79b9104097b465 /sound/soc/codecs/wm8904.c
parent429440c947e72b6f6f317fa4346ddebf9d5e5413 (diff)
ASoC: Convert wm8904 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
-rw-r--r--sound/soc/codecs/wm8904.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 1ad93737f0fa..98d4f815b4a1 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2531,7 +2531,8 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
2531 struct wm8904_priv *wm8904; 2531 struct wm8904_priv *wm8904;
2532 int ret; 2532 int ret;
2533 2533
2534 wm8904 = kzalloc(sizeof(struct wm8904_priv), GFP_KERNEL); 2534 wm8904 = devm_kzalloc(&i2c->dev, sizeof(struct wm8904_priv),
2535 GFP_KERNEL);
2535 if (wm8904 == NULL) 2536 if (wm8904 == NULL)
2536 return -ENOMEM; 2537 return -ENOMEM;
2537 2538
@@ -2541,15 +2542,13 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
2541 2542
2542 ret = snd_soc_register_codec(&i2c->dev, 2543 ret = snd_soc_register_codec(&i2c->dev,
2543 &soc_codec_dev_wm8904, &wm8904_dai, 1); 2544 &soc_codec_dev_wm8904, &wm8904_dai, 1);
2544 if (ret < 0) 2545
2545 kfree(wm8904);
2546 return ret; 2546 return ret;
2547} 2547}
2548 2548
2549static __devexit int wm8904_i2c_remove(struct i2c_client *client) 2549static __devexit int wm8904_i2c_remove(struct i2c_client *client)
2550{ 2550{
2551 snd_soc_unregister_codec(&client->dev); 2551 snd_soc_unregister_codec(&client->dev);
2552 kfree(i2c_get_clientdata(client));
2553 return 0; 2552 return 0;
2554} 2553}
2555 2554