diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-30 21:18:01 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-22 13:57:05 +0000 |
| commit | 2b40e9d97d196f98ef356003d400d5675174b4fc (patch) | |
| tree | d904d7a6c68805c801c78ef0a012a9bf5ff4e89a /drivers/mfd/wm8400-core.c | |
| parent | 130a70323c323046b15a76ef1147b1fe700afd10 (diff) | |
| download | linux-stable-2b40e9d97d196f98ef356003d400d5675174b4fc.tar.gz linux-stable-2b40e9d97d196f98ef356003d400d5675174b4fc.tar.bz2 linux-stable-2b40e9d97d196f98ef356003d400d5675174b4fc.zip | |
mfd: wm8400: Convert to devm_regmap_init_i2c()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/wm8400-core.c')
| -rw-r--r-- | drivers/mfd/wm8400-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index 2204893444a6..237764ae5f9b 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c @@ -350,7 +350,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c, goto err; } - wm8400->regmap = regmap_init_i2c(i2c, &wm8400_regmap_config); + wm8400->regmap = devm_regmap_init_i2c(i2c, &wm8400_regmap_config); if (IS_ERR(wm8400->regmap)) { ret = PTR_ERR(wm8400->regmap); goto err; @@ -361,12 +361,10 @@ static int wm8400_i2c_probe(struct i2c_client *i2c, ret = wm8400_init(wm8400, i2c->dev.platform_data); if (ret != 0) - goto map_err; + goto err; return 0; -map_err: - regmap_exit(wm8400->regmap); err: return ret; } @@ -376,7 +374,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c) struct wm8400 *wm8400 = i2c_get_clientdata(i2c); wm8400_release(wm8400); - regmap_exit(wm8400->regmap); return 0; } |