summaryrefslogtreecommitdiff
path: root/drivers/extcon
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2020-08-26 18:23:41 +0300
committerChanwoo Choi <cw00.choi@samsung.com>2020-09-24 13:20:48 +0300
commit611e92a0a3dc654be2cca3617a34b433815cee00 (patch)
tree4fbf594f825933a72b26986abde96a55dcd006fa /drivers/extcon
parentf6dfb3c9a0bb4bc83f6583125bd3df24e38e5779 (diff)
downloadlinux-611e92a0a3dc654be2cca3617a34b433815cee00.tar.xz
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. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r--drivers/extcon/extcon-ptn5150.c14
1 files 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);