Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: wm8903: Convert to devm_regmap_init_i2c()

Browse source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-06-09 10:21:16 +08:00
parent 0f163546a7
commit 7d11668494
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/soc/codecs/wm8903.c
View file

@ -2124,7 +2124,7 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
return -ENOMEM; return -ENOMEM;
wm8903->dev = &i2c->dev; wm8903->dev = &i2c->dev;
wm8903->regmap = regmap_init_i2c(i2c, &wm8903_regmap); wm8903->regmap = devm_regmap_init_i2c(i2c, &wm8903_regmap);
if (IS_ERR(wm8903->regmap)) { if (IS_ERR(wm8903->regmap)) {
ret = PTR_ERR(wm8903->regmap); ret = PTR_ERR(wm8903->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n", dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@ -2191,7 +2191,6 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
return 0; return 0;
err: err:
regmap_exit(wm8903->regmap);
return ret; return ret;
} }
@ -2200,7 +2199,6 @@ static __devexit int wm8903_i2c_remove(struct i2c_client *client)
struct wm8903_priv *wm8903 = i2c_get_clientdata(client); struct wm8903_priv *wm8903 = i2c_get_clientdata(client);
wm8903_free_gpio(wm8903); wm8903_free_gpio(wm8903);
regmap_exit(wm8903->regmap);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
return 0; return 0;