diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-09 05:26:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-09 06:07:41 +0200 |
| commit | d633edd95dc938f3f5f0d4e431932f4ca042bffb (patch) | |
| tree | 67d33c926fa0b5cbe0c8597b89eb2395fc8856fb /sound | |
| parent | ASoC: wm8904: Convert to module_i2c_driver() (diff) | |
| download | linux-d633edd95dc938f3f5f0d4e431932f4ca042bffb.tar.xz linux-d633edd95dc938f3f5f0d4e431932f4ca042bffb.zip | |
ASoC: wm8904: Convert to devm_regmap_init_i2c()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 02bc2caac83a..560a9a47596b 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2263,7 +2263,7 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, if (wm8904 == NULL) return -ENOMEM; - wm8904->regmap = regmap_init_i2c(i2c, &wm8904_regmap); + wm8904->regmap = devm_regmap_init_i2c(i2c, &wm8904_regmap); if (IS_ERR(wm8904->regmap)) { ret = PTR_ERR(wm8904->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", @@ -2283,15 +2283,12 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, return 0; err: - regmap_exit(wm8904->regmap); return ret; } static __devexit int wm8904_i2c_remove(struct i2c_client *client) { - struct wm8904_priv *wm8904 = i2c_get_clientdata(client); snd_soc_unregister_codec(&client->dev); - regmap_exit(wm8904->regmap); return 0; } |