hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: wm8983: Convert to devm_kzalloc() 

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-09-10 15:14:16 +08:00
parent 822b4b8d63
commit d6e2dc150b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/wm8983.c
View File

@ -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)
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,
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,
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;
} }