summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-09 04:21:16 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-09 06:07:19 +0200
commit7d116684945459e98538c797dca37c54ddd89906 (patch)
treef9a971b57ed85c937e4ee67420df8c38281f3e03
parentASoC: tegra: use regmap more directly (diff)
downloadlinux-7d116684945459e98538c797dca37c54ddd89906.tar.xz
linux-7d116684945459e98538c797dca37c54ddd89906.zip
ASoC: wm8903: Convert to devm_regmap_init_i2c()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8903.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 304b5cff3482..3abd450842ee 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -2124,7 +2124,7 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
return -ENOMEM;
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)) {
ret = PTR_ERR(wm8903->regmap);
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;
err:
- regmap_exit(wm8903->regmap);
return ret;
}
@@ -2200,7 +2199,6 @@ static __devexit int wm8903_i2c_remove(struct i2c_client *client)
struct wm8903_priv *wm8903 = i2c_get_clientdata(client);
wm8903_free_gpio(wm8903);
- regmap_exit(wm8903->regmap);
snd_soc_unregister_codec(&client->dev);
return 0;