diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-29 06:16:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-20 08:58:19 -0500 |
commit | 623105dc97010f851f8fd22b7ce80b77d860b5f4 (patch) | |
tree | 9a29f335879bb730910a0ee28ee867e7bc513af5 /sound/soc/codecs/wm8978.c | |
parent | 803b37885d355438192516d73ba3565e744a8b90 (diff) |
ASoC: Convert wm8978 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8978.c')
-rw-r--r-- | sound/soc/codecs/wm8978.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 36468f85f301..051f5d0d37d6 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -997,7 +997,8 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, | |||
997 | struct wm8978_priv *wm8978; | 997 | struct wm8978_priv *wm8978; |
998 | int ret; | 998 | int ret; |
999 | 999 | ||
1000 | wm8978 = kzalloc(sizeof(struct wm8978_priv), GFP_KERNEL); | 1000 | wm8978 = devm_kzalloc(&i2c->dev, sizeof(struct wm8978_priv), |
1001 | GFP_KERNEL); | ||
1001 | if (wm8978 == NULL) | 1002 | if (wm8978 == NULL) |
1002 | return -ENOMEM; | 1003 | return -ENOMEM; |
1003 | 1004 | ||
@@ -1005,15 +1006,14 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, | |||
1005 | 1006 | ||
1006 | ret = snd_soc_register_codec(&i2c->dev, | 1007 | ret = snd_soc_register_codec(&i2c->dev, |
1007 | &soc_codec_dev_wm8978, &wm8978_dai, 1); | 1008 | &soc_codec_dev_wm8978, &wm8978_dai, 1); |
1008 | if (ret < 0) | 1009 | |
1009 | kfree(wm8978); | ||
1010 | return ret; | 1010 | return ret; |
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | static __devexit int wm8978_i2c_remove(struct i2c_client *client) | 1013 | static __devexit int wm8978_i2c_remove(struct i2c_client *client) |
1014 | { | 1014 | { |
1015 | snd_soc_unregister_codec(&client->dev); | 1015 | snd_soc_unregister_codec(&client->dev); |
1016 | kfree(i2c_get_clientdata(client)); | 1016 | |
1017 | return 0; | 1017 | return 0; |
1018 | } | 1018 | } |
1019 | 1019 | ||