|
@@ -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;
|
|
|
}
|