diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-11-22 09:38:35 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-23 23:32:31 +0900 |
| commit | d5ff3c8a51a79876b9489bed7c314e4a792370f5 (patch) | |
| tree | 48c2e4a564af7bfab58ad856858441c7639d9716 /sound/soc/codecs/wm8995.c | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
| download | linux-d5ff3c8a51a79876b9489bed7c314e4a792370f5.tar.bz2 | |
ASoC: wm8995: Convert to use devm_kzalloc()
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8995.c')
| -rw-r--r-- | sound/soc/codecs/wm8995.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 28c89b094c6e..2eb68c16db31 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -2261,7 +2261,7 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi) struct wm8995_priv *wm8995; int ret; - wm8995 = kzalloc(sizeof *wm8995, GFP_KERNEL); + wm8995 = devm_kzalloc(&spi->dev, sizeof(*wm8995), GFP_KERNEL); if (!wm8995) return -ENOMEM; @@ -2271,7 +2271,7 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi) if (IS_ERR(wm8995->regmap)) { ret = PTR_ERR(wm8995->regmap); dev_err(&spi->dev, "Failed to register regmap: %d\n", ret); - goto err_alloc; + return ret; } ret = snd_soc_register_codec(&spi->dev, @@ -2284,8 +2284,6 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi) err_regmap: regmap_exit(wm8995->regmap); -err_alloc: - kfree(wm8995); return ret; } @@ -2295,7 +2293,6 @@ static int __devexit wm8995_spi_remove(struct spi_device *spi) struct wm8995_priv *wm8995 = spi_get_drvdata(spi); snd_soc_unregister_codec(&spi->dev); regmap_exit(wm8995->regmap); - kfree(wm8995); return 0; } @@ -2316,7 +2313,7 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, struct wm8995_priv *wm8995; int ret; - wm8995 = kzalloc(sizeof *wm8995, GFP_KERNEL); + wm8995 = devm_kzalloc(&i2c->dev, sizeof(*wm8995), GFP_KERNEL); if (!wm8995) return -ENOMEM; @@ -2326,7 +2323,7 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, if (IS_ERR(wm8995->regmap)) { ret = PTR_ERR(wm8995->regmap); dev_err(&i2c->dev, "Failed to register regmap: %d\n", ret); - goto err_alloc; + return ret; } ret = snd_soc_register_codec(&i2c->dev, @@ -2341,8 +2338,6 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, err_regmap: regmap_exit(wm8995->regmap); -err_alloc: - kfree(wm8995); return ret; } @@ -2353,7 +2348,6 @@ static __devexit int wm8995_i2c_remove(struct i2c_client *client) snd_soc_unregister_codec(&client->dev); regmap_exit(wm8995->regmap); - kfree(wm8995); return 0; } |