summaryrefslogtreecommitdiff
path: root/drivers/regulator/act8865-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-06-30 15:32:09 +0800
committerMark Brown <broonie@linaro.org>2014-08-05 18:02:52 +0100
commit40d3bc19667337d4cbad0075d048261fcbe39117 (patch)
tree22af50a987b47b20557014085b44c70afff0c7d3 /drivers/regulator/act8865-regulator.c
parent48a1e1b50d9e848fea9708795bd5d9aa97aa9c2a (diff)
downloadlinux-40d3bc19667337d4cbad0075d048261fcbe39117.tar.gz
regulator: act8865: Remove error variable in act8865_pmic_probe
Simply use ret variable instead. Also remove unneeded initialize for ret variable. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/act8865-regulator.c')
-rw-r--r--drivers/regulator/act8865-regulator.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index fe2c038f8cbc..f07be3647985 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -278,8 +278,7 @@ static int act8865_pmic_probe(struct i2c_client *client,
struct act8865 *act8865;
struct device_node *of_node[ACT8865_REG_NUM];
int i;
- int ret = -EINVAL;
- int error;
+ int ret;
if (dev->of_node && !pdata) {
const struct of_device_id *id;
@@ -307,10 +306,10 @@ static int act8865_pmic_probe(struct i2c_client *client,
act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config);
if (IS_ERR(act8865->regmap)) {
- error = PTR_ERR(act8865->regmap);
+ ret = PTR_ERR(act8865->regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n",
- error);
- return error;
+ ret);
+ return ret;
}
/* Finally register devices */