diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-28 23:04:15 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 07:28:12 -0500 |
commit | a92b0a0803a40f91689fa479b7a169d0467ba33f (patch) | |
tree | 9b67c3343dfa2d2370167be6610b2a84d06a7e21 /sound/soc/codecs/rt5631.c | |
parent | bf791bdb383fdf159c2282d958682b92a2601170 (diff) |
ASoC: Convert rt5631 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/rt5631.c')
-rw-r--r-- | sound/soc/codecs/rt5631.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index f6e4f5ed9286..20c324c7c349 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c | |||
@@ -1724,7 +1724,8 @@ static int rt5631_i2c_probe(struct i2c_client *i2c, | |||
1724 | struct rt5631_priv *rt5631; | 1724 | struct rt5631_priv *rt5631; |
1725 | int ret; | 1725 | int ret; |
1726 | 1726 | ||
1727 | rt5631 = kzalloc(sizeof(struct rt5631_priv), GFP_KERNEL); | 1727 | rt5631 = devm_kzalloc(&i2c->dev, sizeof(struct rt5631_priv), |
1728 | GFP_KERNEL); | ||
1728 | if (NULL == rt5631) | 1729 | if (NULL == rt5631) |
1729 | return -ENOMEM; | 1730 | return -ENOMEM; |
1730 | 1731 | ||
@@ -1732,16 +1733,12 @@ static int rt5631_i2c_probe(struct i2c_client *i2c, | |||
1732 | 1733 | ||
1733 | ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5631, | 1734 | ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5631, |
1734 | rt5631_dai, ARRAY_SIZE(rt5631_dai)); | 1735 | rt5631_dai, ARRAY_SIZE(rt5631_dai)); |
1735 | if (ret < 0) | ||
1736 | kfree(rt5631); | ||
1737 | |||
1738 | return ret; | 1736 | return ret; |
1739 | } | 1737 | } |
1740 | 1738 | ||
1741 | static __devexit int rt5631_i2c_remove(struct i2c_client *client) | 1739 | static __devexit int rt5631_i2c_remove(struct i2c_client *client) |
1742 | { | 1740 | { |
1743 | snd_soc_unregister_codec(&client->dev); | 1741 | snd_soc_unregister_codec(&client->dev); |
1744 | kfree(i2c_get_clientdata(client)); | ||
1745 | return 0; | 1742 | return 0; |
1746 | } | 1743 | } |
1747 | 1744 | ||