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

ASoC: wm9081: Use devm_regmap_init_i2c() 

devm_regmap_init_i2c() is device managed and makes error
handling and code cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Sachin Kamat 2012-11-26 17:19:47 +05:30 committed by Mark Brown
parent 9489e9dcae
commit a5710c0135
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/codecs/wm9081.c
View File

@ -1341,28 +1341,27 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm9081); i2c_set_clientdata(i2c, wm9081);
wm9081->regmap = regmap_init_i2c(i2c, &wm9081_regmap); wm9081->regmap = devm_regmap_init_i2c(i2c, &wm9081_regmap);
if (IS_ERR(wm9081->regmap)) { if (IS_ERR(wm9081->regmap)) {
ret = PTR_ERR(wm9081->regmap); ret = PTR_ERR(wm9081->regmap);
dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret); dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret);
goto err; return ret;
} }
ret = regmap_read(wm9081->regmap, WM9081_SOFTWARE_RESET, &reg); ret = regmap_read(wm9081->regmap, WM9081_SOFTWARE_RESET, &reg);
if (ret != 0) { if (ret != 0) {
dev_err(&i2c->dev, "Failed to read chip ID: %d\n", ret); dev_err(&i2c->dev, "Failed to read chip ID: %d\n", ret);
goto err_regmap; return ret;
} }
if (reg != 0x9081) { if (reg != 0x9081) {
dev_err(&i2c->dev, "Device is not a WM9081: ID=0x%x\n", reg); dev_err(&i2c->dev, "Device is not a WM9081: ID=0x%x\n", reg);
ret = -EINVAL; return -EINVAL;
goto err_regmap;
} }
ret = wm9081_reset(wm9081->regmap); ret = wm9081_reset(wm9081->regmap);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c->dev, "Failed to issue reset\n"); dev_err(&i2c->dev, "Failed to issue reset\n");
goto err_regmap; return ret;
} }
if (dev_get_platdata(&i2c->dev)) if (dev_get_platdata(&i2c->dev))
@ -1382,23 +1381,14 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm9081, &wm9081_dai, 1); &soc_codec_dev_wm9081, &wm9081_dai, 1);
if (ret < 0) if (ret < 0)
goto err_regmap; return ret;
return 0; return 0;
err_regmap:
regmap_exit(wm9081->regmap);
err:
return ret;
} }
static __devexit int wm9081_i2c_remove(struct i2c_client *client) static __devexit int wm9081_i2c_remove(struct i2c_client *client)
{ {
struct wm9081_priv *wm9081 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
regmap_exit(wm9081->regmap);
return 0; return 0;
} }