2020-08-26 15:25:28

by Andy Shevchenko

Subject: [PATCH v2] extcon: ptn5150: Deduplicate parts of dev_err_probe()

dev_err_probe() is designed to be used like

return dev_err_probe(dev, ret, "Error message\n");

Hence no need to have a separate return statement. Besides that
dev_err_probe() prints already returned error code, no need to repeat
that either.

Cc: Vijai Kumar K <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
---
v2: dropped Fixed tag (Krzysztof)
drivers/extcon/extcon-ptn5150.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/extcon/extcon-ptn5150.c b/drivers/extcon/extcon-ptn5150.c
index 8ba706fad887..051bf374b43f 100644
--- a/drivers/extcon/extcon-ptn5150.c
+++ b/drivers/extcon/extcon-ptn5150.c
@@ -242,8 +242,7 @@ static int ptn5150_i2c_probe(struct i2c_client *i2c)
dev_info(dev, "No VBUS GPIO, ignoring VBUS control\n");
info->vbus_gpiod = NULL;
} else {
- dev_err_probe(dev, ret, "failed to get VBUS GPIO\n");
- return ret;
+ return dev_err_probe(dev, ret, "failed to get VBUS GPIO\n");
}
}

@@ -253,10 +252,8 @@ static int ptn5150_i2c_probe(struct i2c_client *i2c)

info->regmap = devm_regmap_init_i2c(i2c, &ptn5150_regmap_config);
if (IS_ERR(info->regmap)) {
- ret = PTR_ERR(info->regmap);
- dev_err_probe(info->dev, ret, "failed to allocate register map: %d\n",
- ret);
- return ret;
+ return dev_err_probe(info->dev, PTR_ERR(info->regmap),
+ "failed to allocate register map\n");
}

if (i2c->irq > 0) {
@@ -264,9 +261,8 @@ static int ptn5150_i2c_probe(struct i2c_client *i2c)
} else {
info->int_gpiod = devm_gpiod_get(&i2c->dev, "int", GPIOD_IN);
if (IS_ERR(info->int_gpiod)) {
- ret = PTR_ERR(info->int_gpiod);
- dev_err_probe(dev, ret, "failed to get INT GPIO\n");
- return ret;
+ return dev_err_probe(dev, PTR_ERR(info->int_gpiod),
+ "failed to get INT GPIO\n");
}

info->irq = gpiod_to_irq(info->int_gpiod);
--
2.28.0

2020-08-27 03:29:03

by Chanwoo Choi

Subject: Re: [PATCH v2] extcon: ptn5150: Deduplicate parts of dev_err_probe()

Hi Andy,

On 8/27/20 12:23 AM, Andy Shevchenko wrote:
> dev_err_probe() is designed to be used like
>
> return dev_err_probe(dev, ret, "Error message\n");
>
> Hence no need to have a separate return statement. Besides that
> dev_err_probe() prints already returned error code, no need to repeat
> that either.
>
> Cc: Vijai Kumar K <[email protected]>
> Signed-off-by: Andy Shevchenko <[email protected]>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> ---
> v2: dropped Fixed tag (Krzysztof)
> drivers/extcon/extcon-ptn5150.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/extcon/extcon-ptn5150.c b/drivers/extcon/extcon-ptn5150.c
> index 8ba706fad887..051bf374b43f 100644
> --- a/drivers/extcon/extcon-ptn5150.c
> +++ b/drivers/extcon/extcon-ptn5150.c
> @@ -242,8 +242,7 @@ static int ptn5150_i2c_probe(struct i2c_client *i2c)
> dev_info(dev, "No VBUS GPIO, ignoring VBUS control\n");
> info->vbus_gpiod = NULL;
> } else {
> - dev_err_probe(dev, ret, "failed to get VBUS GPIO\n");
> - return ret;
> + return dev_err_probe(dev, ret, "failed to get VBUS GPIO\n");
> }
> }
>
> @@ -253,10 +252,8 @@ static int ptn5150_i2c_probe(struct i2c_client *i2c)
>
> info->regmap = devm_regmap_init_i2c(i2c, &ptn5150_regmap_config);
> if (IS_ERR(info->regmap)) {
> - ret = PTR_ERR(info->regmap);
> - dev_err_probe(info->dev, ret, "failed to allocate register map: %d\n",
> - ret);
> - return ret;
> + return dev_err_probe(info->dev, PTR_ERR(info->regmap),
> + "failed to allocate register map\n");
> }
>
> if (i2c->irq > 0) {
> @@ -264,9 +261,8 @@ static int ptn5150_i2c_probe(struct i2c_client *i2c)
> } else {
> info->int_gpiod = devm_gpiod_get(&i2c->dev, "int", GPIOD_IN);
> if (IS_ERR(info->int_gpiod)) {
> - ret = PTR_ERR(info->int_gpiod);
> - dev_err_probe(dev, ret, "failed to get INT GPIO\n");
> - return ret;
> + return dev_err_probe(dev, PTR_ERR(info->int_gpiod),
> + "failed to get INT GPIO\n");
> }
>
> info->irq = gpiod_to_irq(info->int_gpiod);
>

Applied it. Thanks.

--
Best Regards,
Chanwoo Choi
Samsung Electronics