From 40d3bc19667337d4cbad0075d048261fcbe39117 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 30 Jun 2014 15:32:09 +0800 Subject: 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 Signed-off-by: Mark Brown --- drivers/regulator/act8865-regulator.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index fe2c038f..f07be36 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 */ -- cgit v1.1