diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-29 16:23:04 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-20 08:58:25 -0500 |
commit | ba5c88d02de255b51d399001115384f8847cb0df (patch) | |
tree | 52ccf05d99ea0f96ea1134758169b85462adcfe5 | |
parent | 1e9c898df0ef659dacbc9ee037f825cc380854cf (diff) |
ASoC: Convert WM8955 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/wm8955.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index adcfdcaa9fbc..cc6f6692bf5e 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c | |||
@@ -1007,7 +1007,8 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c, | |||
1007 | struct wm8955_priv *wm8955; | 1007 | struct wm8955_priv *wm8955; |
1008 | int ret; | 1008 | int ret; |
1009 | 1009 | ||
1010 | wm8955 = kzalloc(sizeof(struct wm8955_priv), GFP_KERNEL); | 1010 | wm8955 = devm_kzalloc(&i2c->dev, sizeof(struct wm8955_priv), |
1011 | GFP_KERNEL); | ||
1011 | if (wm8955 == NULL) | 1012 | if (wm8955 == NULL) |
1012 | return -ENOMEM; | 1013 | return -ENOMEM; |
1013 | 1014 | ||
@@ -1016,15 +1017,13 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c, | |||
1016 | 1017 | ||
1017 | ret = snd_soc_register_codec(&i2c->dev, | 1018 | ret = snd_soc_register_codec(&i2c->dev, |
1018 | &soc_codec_dev_wm8955, &wm8955_dai, 1); | 1019 | &soc_codec_dev_wm8955, &wm8955_dai, 1); |
1019 | if (ret < 0) | 1020 | |
1020 | kfree(wm8955); | ||
1021 | return ret; | 1021 | return ret; |
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | static __devexit int wm8955_i2c_remove(struct i2c_client *client) | 1024 | static __devexit int wm8955_i2c_remove(struct i2c_client *client) |
1025 | { | 1025 | { |
1026 | snd_soc_unregister_codec(&client->dev); | 1026 | snd_soc_unregister_codec(&client->dev); |
1027 | kfree(i2c_get_clientdata(client)); | ||
1028 | return 0; | 1027 | return 0; |
1029 | } | 1028 | } |
1030 | 1029 | ||