* [PATCH v2] extcon: ptn5150: Deduplicate parts of dev_err_probe() @ 2020-08-26 15:23 ` Andy Shevchenko 2020-08-27 3:39 ` Chanwoo Choi 0 siblings, 1 reply; 2+ messages in thread From: Andy Shevchenko @ 2020-08-26 15:23 UTC (permalink / raw) To: linux-kernel, MyungJoo Ham, Chanwoo Choi Cc: Andy Shevchenko, Vijai Kumar K, Krzysztof Kozlowski 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 <vijaikumar.kanagarajan@gmail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> --- 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 ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] extcon: ptn5150: Deduplicate parts of dev_err_probe() 2020-08-26 15:23 ` [PATCH v2] extcon: ptn5150: Deduplicate parts of dev_err_probe() Andy Shevchenko @ 2020-08-27 3:39 ` Chanwoo Choi 0 siblings, 0 replies; 2+ messages in thread From: Chanwoo Choi @ 2020-08-27 3:39 UTC (permalink / raw) To: Andy Shevchenko, linux-kernel, MyungJoo Ham Cc: Vijai Kumar K, Krzysztof Kozlowski 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 <vijaikumar.kanagarajan@gmail.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > 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 ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-27 3:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20200826152348epcas1p28c09ca69c54287c9c55f5403f2c0e4a1@epcas1p2.samsung.com>
2020-08-26 15:23 ` [PATCH v2] extcon: ptn5150: Deduplicate parts of dev_err_probe() Andy Shevchenko
2020-08-27 3:39 ` Chanwoo Choi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®