power: supply: Remove the use of dev_err_probe()

The dev_err_probe() doesn't do anything when error is '-ENOMEM'.
Therefore, remove the useless call to dev_err_probe(), and just
return the value instead.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/max77705_charger.c b/drivers/power/supply/max77705_charger.c
index 329b430d0e50658dc0c210dadca2e8397a7f6507..59090703cc7a9fdc2a2353698a4d7933209bad4b 100644 (file)
--- a/drivers/power/supply/max77705_charger.c
+++ b/drivers/power/supply/max77705_charger.c
@@ -546,7 +546,7 @@ static int max77705_charger_probe(struct i2c_client *i2c)
 
        chg->wqueue = create_singlethread_workqueue(dev_name(dev));
        if (!chg->wqueue)
-               return dev_err_probe(dev, -ENOMEM, "failed to create workqueue\n");
+               return -ENOMEM;
 
        ret = devm_work_autocancel(dev, &chg->chgin_work, max77705_chgin_isr_work);
        if (ret) {

diff --git a/drivers/power/supply/mt6370-charger.c b/drivers/power/supply/mt6370-charger.c
index 29510af4e5953355c0726f21f0f376cd236a3692..eb3bcf81f74166cb33aa33f4579fe231e8b4631a 100644 (file)
--- a/drivers/power/supply/mt6370-charger.c
+++ b/drivers/power/supply/mt6370-charger.c
@@ -904,8 +904,7 @@ static int mt6370_chg_probe(struct platform_device *pdev)
 
        priv->wq = create_singlethread_workqueue(dev_name(priv->dev));
        if (!priv->wq)
-               return dev_err_probe(dev, -ENOMEM,
-                                    "Failed to create workqueue\n");
+               return -ENOMEM;
 
        ret = devm_add_action_or_reset(dev, mt6370_chg_destroy_wq, priv->wq);
        if (ret)

diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c
index 869729dfcd664c061dfff1bff30ab756748d73d4..6fe526222f7f4dc28c59006a1040f9f3a4f599d2 100644 (file)
--- a/drivers/power/supply/sbs-manager.c
+++ b/drivers/power/supply/sbs-manager.c
@@ -348,7 +348,7 @@ static int sbsm_probe(struct i2c_client *client)
        data->muxc = i2c_mux_alloc(adapter, dev, SBSM_MAX_BATS, 0,
                                   I2C_MUX_LOCKED, &sbsm_select, NULL);
        if (!data->muxc)
-               return dev_err_probe(dev, -ENOMEM, "failed to alloc i2c mux\n");
+               return -ENOMEM;
        data->muxc->priv = data;
 
        ret = devm_add_action_or_reset(dev, sbsm_del_mux_adapter, data);