aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/da7210.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-26 07:54:04 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-27 07:58:02 -0500
commit306bf6b19ee3da824fbdbdb2dc4e5d62a8983a2c (patch)
tree53cb058493781cf18fd530c15e42ae9641b13ad4 /sound/soc/codecs/da7210.c
parent2c9d9b6fa70e1881c411d45d2f3d2ab28bd58c75 (diff)
ASoC: Convert da7210 to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/da7210.c')
-rw-r--r--sound/soc/codecs/da7210.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index e4ca61c18605..62e6a9cc82bd 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -944,7 +944,8 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
944 struct da7210_priv *da7210; 944 struct da7210_priv *da7210;
945 int ret; 945 int ret;
946 946
947 da7210 = kzalloc(sizeof(struct da7210_priv), GFP_KERNEL); 947 da7210 = devm_kzalloc(&i2c->dev, sizeof(struct da7210_priv),
948 GFP_KERNEL);
948 if (!da7210) 949 if (!da7210)
949 return -ENOMEM; 950 return -ENOMEM;
950 951
@@ -953,16 +954,12 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
953 954
954 ret = snd_soc_register_codec(&i2c->dev, 955 ret = snd_soc_register_codec(&i2c->dev,
955 &soc_codec_dev_da7210, &da7210_dai, 1); 956 &soc_codec_dev_da7210, &da7210_dai, 1);
956 if (ret < 0)
957 kfree(da7210);
958
959 return ret; 957 return ret;
960} 958}
961 959
962static int __devexit da7210_i2c_remove(struct i2c_client *client) 960static int __devexit da7210_i2c_remove(struct i2c_client *client)
963{ 961{
964 snd_soc_unregister_codec(&client->dev); 962 snd_soc_unregister_codec(&client->dev);
965 kfree(i2c_get_clientdata(client));
966 return 0; 963 return 0;
967} 964}
968 965