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

ASoC: wm8737: Convert to devm_kzalloc() 

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-09-12 09:26:38 +08:00
parent 1a9585b0f7
commit 65fdd9bffa
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/codecs/wm8737.c
View File

@ -647,7 +647,8 @@ static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,
struct wm8737_priv *wm8737; struct wm8737_priv *wm8737;
int ret; int ret;
wm8737 = kzalloc(sizeof(struct wm8737_priv), GFP_KERNEL); wm8737 = devm_kzalloc(&i2c->dev, sizeof(struct wm8737_priv),
GFP_KERNEL);
if (wm8737 == NULL) if (wm8737 == NULL)
return -ENOMEM; return -ENOMEM;
@ -656,8 +657,7 @@ static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8737, &wm8737_dai, 1); &soc_codec_dev_wm8737, &wm8737_dai, 1);
if (ret < 0)
kfree(wm8737);
return ret; return ret;
} }
@ -665,7 +665,7 @@ static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,
static __devexit int wm8737_i2c_remove(struct i2c_client *client) static __devexit int wm8737_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;
} }
@ -693,7 +693,8 @@ static int __devinit wm8737_spi_probe(struct spi_device *spi)
struct wm8737_priv *wm8737; struct wm8737_priv *wm8737;
int ret; int ret;
wm8737 = kzalloc(sizeof(struct wm8737_priv), GFP_KERNEL); wm8737 = devm_kzalloc(&spi->dev, sizeof(struct wm8737_priv),
GFP_KERNEL);
if (wm8737 == NULL) if (wm8737 == NULL)
return -ENOMEM; return -ENOMEM;
@ -702,15 +703,14 @@ static int __devinit wm8737_spi_probe(struct spi_device *spi)
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8737, &wm8737_dai, 1); &soc_codec_dev_wm8737, &wm8737_dai, 1);
if (ret < 0)
kfree(wm8737);
return ret; return ret;
} }
static int __devexit wm8737_spi_remove(struct spi_device *spi) static int __devexit wm8737_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;
} }