openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm8753: Convert to devm_kzalloc() 

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-02-27 15:24:10 +00:00
parent 07a38b1b4e
commit 2c823d14bf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/wm8753.c
View File

@ -1557,7 +1557,8 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
struct wm8753_priv *wm8753; struct wm8753_priv *wm8753;
int ret; int ret;
wm8753 = kzalloc(sizeof(struct wm8753_priv), GFP_KERNEL); wm8753 = devm_kzalloc(&spi->dev, sizeof(struct wm8753_priv),
GFP_KERNEL);
if (wm8753 == NULL) if (wm8753 == NULL)
return -ENOMEM; return -ENOMEM;
@ -1580,7 +1581,6 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
err_regmap: err_regmap:
regmap_exit(wm8753->regmap); regmap_exit(wm8753->regmap);
err: err:
kfree(wm8753);
return ret; return ret;
} }
@ -1612,7 +1612,8 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
struct wm8753_priv *wm8753; struct wm8753_priv *wm8753;
int ret; int ret;
wm8753 = kzalloc(sizeof(struct wm8753_priv), GFP_KERNEL); wm8753 = devm_kzalloc(&i2c->dev, sizeof(struct wm8753_priv),
GFP_KERNEL);
if (wm8753 == NULL) if (wm8753 == NULL)
return -ENOMEM; return -ENOMEM;
@ -1632,10 +1633,10 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret); dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
goto err_regmap; goto err_regmap;
} }
err_regmap: err_regmap:
regmap_exit(wm8753->regmap); regmap_exit(wm8753->regmap);
err: err:
kfree(wm8753);
return ret; return ret;
} }
@ -1645,7 +1646,6 @@ static __devexit int wm8753_i2c_remove(struct i2c_client *client)
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
regmap_exit(wm8753->regmap); regmap_exit(wm8753->regmap);
kfree(wm8753);
return 0; return 0;
} }