lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: wm8400: Convert to devm_regmap_init_i2c()

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark Brown
2012-01-30 21:18:01 +00:00
parent 130a70323c
commit 2b40e9d97d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mfd/wm8400-core.c
View File

@@ -350,7 +350,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
goto err; 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)) { if (IS_ERR(wm8400->regmap)) {
ret = PTR_ERR(wm8400->regmap); ret = PTR_ERR(wm8400->regmap);
goto err; goto err;
@@ -361,12 +361,10 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
ret = wm8400_init(wm8400, i2c->dev.platform_data); ret = wm8400_init(wm8400, i2c->dev.platform_data);
if (ret != 0) if (ret != 0)
goto map_err; goto err;
return 0; return 0;
map_err:
regmap_exit(wm8400->regmap);
err: err:
return ret; return ret;
} }
@@ -376,7 +374,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c)
struct wm8400 *wm8400 = i2c_get_clientdata(i2c); struct wm8400 *wm8400 = i2c_get_clientdata(i2c);
wm8400_release(wm8400); wm8400_release(wm8400);
regmap_exit(wm8400->regmap);
return 0; return 0;
} }