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

power: supply: Remove error prints for devm_add_action_or_reset()

When `devm_add_action_or_reset()` fails, it is due to a failed memory
allocation and will thus return `-ENOMEM`. `dev_err_probe()` doesn't do
anything when error is `-ENOMEM`. Therefore, remove the useless call to
`dev_err_probe()` when `devm_add_action_or_reset()` fails, and just
return the value instead.

Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Waqar Hameed and committed by
Sebastian Reichel
32f350d5 5afce048

+6 -6
+2 -2
drivers/power/supply/mt6370-charger.c
··· 898 898 ret = devm_add_action_or_reset(dev, mt6370_chg_destroy_attach_lock, 899 899 &priv->attach_lock); 900 900 if (ret) 901 - return dev_err_probe(dev, ret, "Failed to init attach lock\n"); 901 + return ret; 902 902 903 903 priv->attach = MT6370_ATTACH_STAT_DETACH; 904 904 ··· 909 909 910 910 ret = devm_add_action_or_reset(dev, mt6370_chg_destroy_wq, priv->wq); 911 911 if (ret) 912 - return dev_err_probe(dev, ret, "Failed to init wq\n"); 912 + return ret; 913 913 914 914 ret = devm_work_autocancel(dev, &priv->bc12_work, mt6370_chg_bc12_work_func); 915 915 if (ret)
+4 -4
drivers/power/supply/rt9467-charger.c
··· 1218 1218 ret = devm_add_action_or_reset(dev, rt9467_chg_destroy_adc_lock, 1219 1219 &data->adc_lock); 1220 1220 if (ret) 1221 - return dev_err_probe(dev, ret, "Failed to init ADC lock\n"); 1221 + return ret; 1222 1222 1223 1223 mutex_init(&data->attach_lock); 1224 1224 ret = devm_add_action_or_reset(dev, rt9467_chg_destroy_attach_lock, 1225 1225 &data->attach_lock); 1226 1226 if (ret) 1227 - return dev_err_probe(dev, ret, "Failed to init attach lock\n"); 1227 + return ret; 1228 1228 1229 1229 mutex_init(&data->ichg_ieoc_lock); 1230 1230 ret = devm_add_action_or_reset(dev, rt9467_chg_destroy_ichg_ieoc_lock, 1231 1231 &data->ichg_ieoc_lock); 1232 1232 if (ret) 1233 - return dev_err_probe(dev, ret, "Failed to init ICHG/IEOC lock\n"); 1233 + return ret; 1234 1234 1235 1235 init_completion(&data->aicl_done); 1236 1236 ret = devm_add_action_or_reset(dev, rt9467_chg_complete_aicl_done, 1237 1237 &data->aicl_done); 1238 1238 if (ret) 1239 - return dev_err_probe(dev, ret, "Failed to init AICL done completion\n"); 1239 + return ret; 1240 1240 1241 1241 ret = rt9467_do_charger_init(data); 1242 1242 if (ret)