Re: [PATCH 1/2] regulator: act8865: Remove error variable in act8865_pmic_probe

2014-07-02 Thread Mark Brown 
On Mon, Jun 30, 2014 at 03:32:09PM +0800, Axel Lin wrote:
> Simply use ret variable instead.
> Also remove unneeded initialize for ret variable.

Applied, thanks.


signature.asc
Description: Digital signature

Re: [PATCH 1/2] regulator: act8865: Remove error variable in act8865_pmic_probe

2014-07-02 Thread Mark Brown 
On Mon, Jun 30, 2014 at 03:32:09PM +0800, Axel Lin wrote:
 Simply use ret variable instead.
 Also remove unneeded initialize for ret variable.

Applied, thanks.


signature.asc
Description: Digital signature

[PATCH 1/2] regulator: act8865: Remove error variable in act8865_pmic_probe

2014-06-30 Thread Axel Lin 
Simply use ret variable instead.
Also remove unneeded initialize for ret variable.

Signed-off-by: Axel Lin 
---
 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 fe2c038..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, _regmap_config);
if (IS_ERR(act8865->regmap)) {
-   error = PTR_ERR(act8865->regmap);
+   ret = PTR_ERR(act8865->regmap);
dev_err(>dev, "Failed to allocate register map: %d\n",
-   error);
-   return error;
+   ret);
+   return ret;
}
 
/* Finally register devices */
-- 
1.9.1



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/2] regulator: act8865: Remove error variable in act8865_pmic_probe

2014-06-30 Thread Axel Lin 
Simply use ret variable instead.
Also remove unneeded initialize for ret variable.

Signed-off-by: Axel Lin axel@ingics.com
---
 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 fe2c038..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 */
-- 
1.9.1



--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/