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>

diff --git a/drivers/power/supply/mt6370-charger.c b/drivers/power/supply/mt6370-charger.c
index 98579998b300db41bde9bd528d5b6d3e484be8be..29510af4e5953355c0726f21f0f376cd236a3692 100644 (file)
--- a/drivers/power/supply/mt6370-charger.c
+++ b/drivers/power/supply/mt6370-charger.c
@@ -898,7 +898,7 @@ static int mt6370_chg_probe(struct platform_device *pdev)
        ret = devm_add_action_or_reset(dev, mt6370_chg_destroy_attach_lock,
                                       &priv->attach_lock);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to init attach lock\n");
+               return ret;
 
        priv->attach = MT6370_ATTACH_STAT_DETACH;
 
@@ -909,7 +909,7 @@ static int mt6370_chg_probe(struct platform_device *pdev)
 
        ret = devm_add_action_or_reset(dev, mt6370_chg_destroy_wq, priv->wq);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to init wq\n");
+               return ret;
 
        ret = devm_work_autocancel(dev, &priv->bc12_work, mt6370_chg_bc12_work_func);
        if (ret)

diff --git a/drivers/power/supply/rt9467-charger.c b/drivers/power/supply/rt9467-charger.c
index e9aba9ad393c9cec309c49e7fb21286f77555261..e2ff9c4609ef1bf300c361826e9504e3ae6e095e 100644 (file)
--- a/drivers/power/supply/rt9467-charger.c
+++ b/drivers/power/supply/rt9467-charger.c
@@ -1218,25 +1218,25 @@ static int rt9467_charger_probe(struct i2c_client *i2c)
        ret = devm_add_action_or_reset(dev, rt9467_chg_destroy_adc_lock,
                                       &data->adc_lock);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to init ADC lock\n");
+               return ret;
 
        mutex_init(&data->attach_lock);
        ret = devm_add_action_or_reset(dev, rt9467_chg_destroy_attach_lock,
                                       &data->attach_lock);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to init attach lock\n");
+               return ret;
 
        mutex_init(&data->ichg_ieoc_lock);
        ret = devm_add_action_or_reset(dev, rt9467_chg_destroy_ichg_ieoc_lock,
                                       &data->ichg_ieoc_lock);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to init ICHG/IEOC lock\n");
+               return ret;
 
        init_completion(&data->aicl_done);
        ret = devm_add_action_or_reset(dev, rt9467_chg_complete_aicl_done,
                                       &data->aicl_done);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to init AICL done completion\n");
+               return ret;
 
        ret = rt9467_do_charger_init(data);
        if (ret)