tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

power: supply: max17042: use dev_err_probe() where appropriate

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.

While at it, return the actual error from devm_regmap_init_i2c() rather
than overwriting with -EINVAL, when relevant.

Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: André Draszik <andre.draszik@linaro.org>
Link: https://patch.msgid.link/20260302-max77759-fg-v3-5-3c5f01dbda23@linaro.org
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

André Draszik and committed by
Sebastian Reichel 699f0f71 e370b67c

+9 -12
+9 -12
drivers/power/supply/max17042_battery.c
··· 1053 1053 chip->dev = dev; 1054 1054 chip->chip_type = chip_type; 1055 1055 chip->regmap = devm_regmap_init_i2c(client, &max17042_regmap_config); 1056 - if (IS_ERR(chip->regmap)) { 1057 - dev_err(dev, "Failed to initialize regmap\n"); 1058 - return -EINVAL; 1059 - } 1056 + if (IS_ERR(chip->regmap)) 1057 + return dev_err_probe(dev, PTR_ERR(chip->regmap), 1058 + "Failed to initialize regmap\n"); 1060 1059 1061 1060 chip->pdata = max17042_get_pdata(chip); 1062 - if (!chip->pdata) { 1063 - dev_err(dev, "no platform data provided\n"); 1064 - return -EINVAL; 1065 - } 1061 + if (!chip->pdata) 1062 + return dev_err_probe(dev, -EINVAL, 1063 + "no platform data provided\n"); 1066 1064 1067 1065 dev_set_drvdata(dev, chip); 1068 1066 psy_cfg.drv_data = chip; ··· 1088 1090 1089 1091 chip->battery = devm_power_supply_register(dev, max17042_desc, 1090 1092 &psy_cfg); 1091 - if (IS_ERR(chip->battery)) { 1092 - dev_err(dev, "failed: power supply register\n"); 1093 - return PTR_ERR(chip->battery); 1094 - } 1093 + if (IS_ERR(chip->battery)) 1094 + return dev_err_probe(dev, PTR_ERR(chip->battery), 1095 + "failed: power supply register\n"); 1095 1096 1096 1097 if (irq) { 1097 1098 unsigned int flags = IRQF_ONESHOT | IRQF_SHARED | IRQF_PROBE_SHARED;