summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:31 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:31 +0900
commit7a7f9875d9d35315c22830be5ce7fdd80b1d1ab0 (patch)
treebc462d06de596c89ee1bd5ef052b8835ad229fba
parentf443a29db9a90723a4d9609c219b49f8747084c2 (diff)
parent385b27f55c9543cc4b973ed00afff7b90b3df3a4 (diff)
downloadlinux-7a7f9875d9d35315c22830be5ce7fdd80b1d1ab0.tar.bz2
Merge remote-tracking branch 'asoc/topic/wm8955' into asoc-next
-rw-r--r--sound/soc/codecs/wm8955.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 2f1c075755b1..7a82b7d28dcd 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -1023,7 +1023,7 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
if (wm8955 == NULL)
return -ENOMEM;
- wm8955->regmap = regmap_init_i2c(i2c, &wm8955_regmap);
+ wm8955->regmap = devm_regmap_init_i2c(i2c, &wm8955_regmap);
if (IS_ERR(wm8955->regmap)) {
ret = PTR_ERR(wm8955->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -1035,22 +1035,13 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8955, &wm8955_dai, 1);
- if (ret != 0)
- goto err;
return ret;
-
-err:
- regmap_exit(wm8955->regmap);
- return ret;
}
static __devexit int wm8955_i2c_remove(struct i2c_client *client)
{
- struct wm8955_priv *wm8955 = i2c_get_clientdata(client);
-
snd_soc_unregister_codec(&client->dev);
- regmap_exit(wm8955->regmap);
return 0;
}