[PATCH 05/11] power: supply: max17042: use dev_err_probe() where appropriate
From: André Draszik
Date: Thu Feb 26 2026 - 08:17:17 EST
dev_err_probe() exists to simplify code, harmonise error messages, and
set the deferred probe reason if relevant - there's no reason not to
use it here.
Signed-off-by: André Draszik <andre.draszik@xxxxxxxxxx>
---
drivers/power/supply/max17042_battery.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index 07759d4fdc37..b9277f81a25d 100644
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -1053,16 +1053,14 @@ static int max17042_probe(struct i2c_client *client, struct device *dev, int irq
chip->dev = dev;
chip->chip_type = chip_type;
chip->regmap = devm_regmap_init_i2c(client, &max17042_regmap_config);
- if (IS_ERR(chip->regmap)) {
- dev_err(dev, "Failed to initialize regmap\n");
- return -EINVAL;
- }
+ if (IS_ERR(chip->regmap))
+ return dev_err_probe(dev, PTR_ERR(chip->regmap),
+ "Failed to initialize regmap\n");
chip->pdata = max17042_get_pdata(chip);
- if (!chip->pdata) {
- dev_err(dev, "no platform data provided\n");
- return -EINVAL;
- }
+ if (!chip->pdata)
+ return dev_err_probe(dev, -EINVAL,
+ "no platform data provided\n");
dev_set_drvdata(dev, chip);
psy_cfg.drv_data = chip;
@@ -1090,10 +1088,9 @@ static int max17042_probe(struct i2c_client *client, struct device *dev, int irq
chip->battery = devm_power_supply_register(dev, max17042_desc,
&psy_cfg);
- if (IS_ERR(chip->battery)) {
- dev_err(dev, "failed: power supply register\n");
- return PTR_ERR(chip->battery);
- }
+ if (IS_ERR(chip->battery))
+ return dev_err_probe(dev, PTR_ERR(chip->battery),
+ "failed: power supply register\n");
if (irq) {
unsigned int flags = IRQF_ONESHOT | IRQF_SHARED | IRQF_PROBE_SHARED;
--
2.53.0.414.gf7e9f6c205-goog