Commit d6e2dc15 authored by Mark Brown's avatar Mark Brown

ASoC: wm8983: Convert to devm_kzalloc()

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 822b4b8d
...@@ -1085,7 +1085,7 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi) ...@@ -1085,7 +1085,7 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi)
struct wm8983_priv *wm8983; struct wm8983_priv *wm8983;
int ret; int ret;
wm8983 = kzalloc(sizeof *wm8983, GFP_KERNEL); wm8983 = devm_kzalloc(&spi->dev, sizeof *wm8983, GFP_KERNEL);
if (!wm8983) if (!wm8983)
return -ENOMEM; return -ENOMEM;
...@@ -1094,15 +1094,12 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi) ...@@ -1094,15 +1094,12 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi)
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8983, &wm8983_dai, 1); &soc_codec_dev_wm8983, &wm8983_dai, 1);
if (ret < 0)
kfree(wm8983);
return ret; return ret;
} }
static int __devexit wm8983_spi_remove(struct spi_device *spi) static int __devexit wm8983_spi_remove(struct spi_device *spi)
{ {
snd_soc_unregister_codec(&spi->dev); snd_soc_unregister_codec(&spi->dev);
kfree(spi_get_drvdata(spi));
return 0; return 0;
} }
...@@ -1123,7 +1120,7 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c, ...@@ -1123,7 +1120,7 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c,
struct wm8983_priv *wm8983; struct wm8983_priv *wm8983;
int ret; int ret;
wm8983 = kzalloc(sizeof *wm8983, GFP_KERNEL); wm8983 = devm_kzalloc(&i2c->dev, sizeof *wm8983, GFP_KERNEL);
if (!wm8983) if (!wm8983)
return -ENOMEM; return -ENOMEM;
...@@ -1132,15 +1129,13 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c, ...@@ -1132,15 +1129,13 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8983, &wm8983_dai, 1); &soc_codec_dev_wm8983, &wm8983_dai, 1);
if (ret < 0)
kfree(wm8983);
return ret; return ret;
} }
static __devexit int wm8983_i2c_remove(struct i2c_client *client) static __devexit int wm8983_i2c_remove(struct i2c_client *client)
{ {
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment