iio: 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>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://patch.msgid.link/pndectqm7te.a.out@axis.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/msa311.c b/drivers/iio/accel/msa311.c
index 3e10225410e89a341411a75e544a890f45c8f55e..2ccb22317bdc4ece34e13642a692780c29a0d125 100644 (file)
--- a/drivers/iio/accel/msa311.c
+++ b/drivers/iio/accel/msa311.c
@@ -1195,7 +1195,7 @@ static int msa311_probe(struct i2c_client *i2c)
         */
        err = devm_add_action_or_reset(dev, msa311_powerdown, msa311);
        if (err)
-               return dev_err_probe(dev, err, "can't add powerdown action\n");
+               return err;
 
        err = pm_runtime_set_active(dev);
        if (err)

diff --git a/drivers/iio/adc/ad4130.c b/drivers/iio/adc/ad4130.c
index dcdb5778f7d64b0865c0cf8fc98ce3358bbc6220..5567ae5dee88ecedea3615f33c7225d1e2ab0ae6 100644 (file)
--- a/drivers/iio/adc/ad4130.c
+++ b/drivers/iio/adc/ad4130.c
@@ -2035,8 +2035,7 @@ static int ad4130_probe(struct spi_device *spi)
 
        ret = devm_add_action_or_reset(dev, ad4130_disable_regulators, st);
        if (ret)
-               return dev_err_probe(dev, ret,
-                                    "Failed to add regulators disable action\n");
+               return ret;
 
        ret = ad4130_soft_reset(st);
        if (ret)

diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index 9808df2e92424283a86e9c105492c7447d071e44..4481a4ca7ac30de1f403af031f7c6647287b281f 100644 (file)
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -1300,7 +1300,7 @@ static int ad7124_probe(struct spi_device *spi)
                ret = devm_add_action_or_reset(&spi->dev, ad7124_reg_disable,
                                               st->vref[i]);
                if (ret)
-                       return dev_err_probe(dev, ret, "Failed to register disable handler for regulator #%d\n", i);
+                       return ret;
        }
 
        st->mclk = devm_clk_get_enabled(&spi->dev, "mclk");

diff --git a/drivers/iio/adc/ad7173.c b/drivers/iio/adc/ad7173.c
index 9a32a18cc8040830ea2de5616162b8bcee3c0739..21a2e9b8695988ba99a07890cb72c7bd63991f1b 100644 (file)
--- a/drivers/iio/adc/ad7173.c
+++ b/drivers/iio/adc/ad7173.c
@@ -1731,8 +1731,7 @@ static int ad7173_fw_parse_device_config(struct iio_dev *indio_dev)
 
        ret = devm_add_action_or_reset(dev, ad7173_disable_regulators, st);
        if (ret)
-               return dev_err_probe(dev, ret,
-                                    "Failed to add regulators disable action\n");
+               return ret;
 
        ret = device_property_match_property_string(dev, "clock-names",
                                                    ad7173_clk_sel,

diff --git a/drivers/iio/adc/mt6577_auxadc.c b/drivers/iio/adc/mt6577_auxadc.c
index 3343b54e8e448d4c91732a02417fb6986bdd45cd..fe9e3ece3fdae136394f48b326d23b51160d4c39 100644 (file)
--- a/drivers/iio/adc/mt6577_auxadc.c
+++ b/drivers/iio/adc/mt6577_auxadc.c
@@ -297,8 +297,7 @@ static int mt6577_auxadc_probe(struct platform_device *pdev)
 
        ret = devm_add_action_or_reset(&pdev->dev, mt6577_power_off, adc_dev);
        if (ret)
-               return dev_err_probe(&pdev->dev, ret,
-                                    "Failed to add action to managed power off\n");
+               return ret;
 
        ret = devm_iio_device_register(&pdev->dev, indio_dev);
        if (ret < 0)

diff --git a/drivers/iio/adc/pac1921.c b/drivers/iio/adc/pac1921.c
index 72aa4ca2e5a46b295305ee3295ad0135a13ab3b2..35433250b00872edfc9214c632917a8b8ae6e281 100644 (file)
--- a/drivers/iio/adc/pac1921.c
+++ b/drivers/iio/adc/pac1921.c
@@ -1279,8 +1279,7 @@ static int pac1921_probe(struct i2c_client *client)
        ret = devm_add_action_or_reset(dev, pac1921_regulator_disable,
                                       priv->vdd);
        if (ret)
-               return dev_err_probe(dev, ret,
-                       "Cannot add action for vdd regulator disposal\n");
+               return ret;
 
        msleep(PAC1921_POWERUP_TIME_MS);
 

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index bd62daea0a3e5b879a8a970d107e3342fda7b8c0..926971cb50bfe54a0461fc91a3a31c279058ea28 100644 (file)
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -527,8 +527,7 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
        ret = devm_add_action_or_reset(&pdev->dev,
                                       rockchip_saradc_regulator_disable, info);
        if (ret)
-               return dev_err_probe(&pdev->dev, ret,
-                                    "failed to register devm action\n");
+               return ret;
 
        ret = regulator_get_voltage(info->vref);
        if (ret < 0)

diff --git a/drivers/iio/adc/ti-ads1119.c b/drivers/iio/adc/ti-ads1119.c
index d2f86e1ec65641feb3625218611fc8ca00e9f64f..3e4f79dfb0784654ece92cfb8a8ec262e39ee991 100644 (file)
--- a/drivers/iio/adc/ti-ads1119.c
+++ b/drivers/iio/adc/ti-ads1119.c
@@ -778,8 +778,7 @@ static int ads1119_probe(struct i2c_client *client)
 
        ret = devm_add_action_or_reset(dev, ads1119_powerdown, st);
        if (ret)
-               return dev_err_probe(dev, ret,
-                                    "Failed to add powerdown action\n");
+               return ret;
 
        return devm_iio_device_register(dev, indio_dev);
 }

diff --git a/drivers/iio/adc/ti-ads7924.c b/drivers/iio/adc/ti-ads7924.c
index b1f745f75dbee01b1d3900a91cca3406cf5d6c26..46255c530cb410bf7a51d820b77ed3ca126d5d1d 100644 (file)
--- a/drivers/iio/adc/ti-ads7924.c
+++ b/drivers/iio/adc/ti-ads7924.c
@@ -399,8 +399,7 @@ static int ads7924_probe(struct i2c_client *client)
 
        ret = devm_add_action_or_reset(dev, ads7924_reg_disable, data->vref_reg);
        if (ret)
-               return dev_err_probe(dev, ret,
-                                    "failed to add regulator disable action\n");
+               return ret;
 
        ret = ads7924_reset(indio_dev);
        if (ret < 0)
@@ -414,8 +413,7 @@ static int ads7924_probe(struct i2c_client *client)
 
        ret = devm_add_action_or_reset(dev, ads7924_set_idle_mode, data);
        if (ret)
-               return dev_err_probe(dev, ret,
-                                    "failed to add idle mode action\n");
+               return ret;
 
        /* Use minimum signal acquire time. */
        ret = regmap_update_bits(data->regmap, ADS7924_ACQCONFIG_REG,

diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index 47f1c7e9efa9f425a4c7cf82be930234e2c18434..6665409a9a8746eaebb4a693f19ff078fc4230b0 100644 (file)
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -673,8 +673,7 @@ static int adf4350_probe(struct spi_device *spi)
 
        ret = devm_add_action_or_reset(&spi->dev, adf4350_power_down, indio_dev);
        if (ret)
-               return dev_err_probe(&spi->dev, ret,
-                                    "Failed to add action to managed power down\n");
+               return ret;
 
        return devm_iio_device_register(&spi->dev, indio_dev);
 }

diff --git a/drivers/iio/light/al3000a.c b/drivers/iio/light/al3000a.c
index 6f301c0670454e2f729e1b2545e6203cdbc91c11..9871096cbab3a92e8c2a17fcc3c8e319f88afd48 100644 (file)
--- a/drivers/iio/light/al3000a.c
+++ b/drivers/iio/light/al3000a.c
@@ -94,7 +94,7 @@ static int al3000a_init(struct al3000a_data *data)
 
        ret = devm_add_action_or_reset(dev, al3000a_set_pwr_off, data);
        if (ret)
-               return dev_err_probe(dev, ret, "failed to add action\n");
+               return ret;
 
        ret = regmap_write(data->regmap, AL3000A_REG_SYSTEM, AL3000A_CONFIG_RESET);
        if (ret)

diff --git a/drivers/iio/light/apds9306.c b/drivers/iio/light/apds9306.c
index f676da245aa758fe0aea3b837ef4a2438c166fc2..5eb33e8e3ad991a54ccf9b9b14db168d3fcae832 100644 (file)
--- a/drivers/iio/light/apds9306.c
+++ b/drivers/iio/light/apds9306.c
@@ -1309,7 +1309,7 @@ static int apds9306_probe(struct i2c_client *client)
 
        ret = devm_add_action_or_reset(dev, apds9306_powerdown, data);
        if (ret)
-               return dev_err_probe(dev, ret, "failed to add action or reset\n");
+               return ret;
 
        ret = devm_iio_device_register(dev, indio_dev);
        if (ret)

diff --git a/drivers/iio/light/bh1745.c b/drivers/iio/light/bh1745.c
index 4e9bd8f831f7834dbcdbc5df4931f473d277d814..c7c604c96f6e0407c37842032f34390004590274 100644 (file)
--- a/drivers/iio/light/bh1745.c
+++ b/drivers/iio/light/bh1745.c
@@ -814,8 +814,7 @@ static int bh1745_init(struct bh1745_data *data)
 
        ret = devm_add_action_or_reset(dev, bh1745_power_off, data);
        if (ret)
-               return dev_err_probe(dev, ret,
-                                    "Failed to add action or reset\n");
+               return ret;
 
        return 0;
 }

diff --git a/drivers/iio/light/opt4001.c b/drivers/iio/light/opt4001.c
index ba4eb82d9bc259b240052efaa0d5442d7e4614c5..95167273bb9047f2eca194b837eb8b7b83b34a91 100644 (file)
--- a/drivers/iio/light/opt4001.c
+++ b/drivers/iio/light/opt4001.c
@@ -428,8 +428,7 @@ static int opt4001_probe(struct i2c_client *client)
                                        opt4001_chip_off_action,
                                        chip);
        if (ret < 0)
-               return dev_err_probe(&client->dev, ret,
-                                    "Failed to setup power off action\n");
+               return ret;
 
        return devm_iio_device_register(&client->dev, indio_dev);
 }

diff --git a/drivers/iio/light/opt4060.c b/drivers/iio/light/opt4060.c
index 566f1bb8fe2a1cb4169e31773e49456dd74398c2..7a1b6c70382352576ab62b81c30fc25e2297dca8 100644 (file)
--- a/drivers/iio/light/opt4060.c
+++ b/drivers/iio/light/opt4060.c
@@ -1299,8 +1299,7 @@ static int opt4060_probe(struct i2c_client *client)
 
        ret = devm_add_action_or_reset(dev, opt4060_chip_off_action, chip);
        if (ret < 0)
-               return dev_err_probe(dev, ret,
-                                    "Failed to setup power off action\n");
+               return ret;
 
        ret = opt4060_setup_buffer(chip, indio_dev);
        if (ret)

diff --git a/drivers/iio/magnetometer/als31300.c b/drivers/iio/magnetometer/als31300.c
index f72af829715f71709a2b5948a419fd7516bb9b0f..928e1378304c9eb9cad320056f78bb39397a834f 100644 (file)
--- a/drivers/iio/magnetometer/als31300.c
+++ b/drivers/iio/magnetometer/als31300.c
@@ -373,7 +373,7 @@ static int als31300_probe(struct i2c_client *i2c)
 
        ret = devm_add_action_or_reset(dev, als31300_power_down, data);
        if (ret)
-               return dev_err_probe(dev, ret, "failed to add powerdown action\n");
+               return ret;
 
        indio_dev->info = &als31300_info;
        indio_dev->modes = INDIO_DIRECT_MODE;

diff --git a/drivers/iio/magnetometer/tmag5273.c b/drivers/iio/magnetometer/tmag5273.c
index 2ca5c26f00917426dacb4835fc9684d0710d98c9..bdb656b031b1c34102d29f3eba905862ea595b87 100644 (file)
--- a/drivers/iio/magnetometer/tmag5273.c
+++ b/drivers/iio/magnetometer/tmag5273.c
@@ -642,7 +642,7 @@ static int tmag5273_probe(struct i2c_client *i2c)
         */
        ret = devm_add_action_or_reset(dev, tmag5273_power_down, data);
        if (ret)
-               return dev_err_probe(dev, ret, "failed to add powerdown action\n");
+               return ret;
 
        ret = pm_runtime_set_active(dev);
        if (ret < 0)

diff --git a/drivers/iio/proximity/vl53l0x-i2c.c b/drivers/iio/proximity/vl53l0x-i2c.c
index b4d82f24be296c37e9243167b463bf96368e8ec4..696340ec027ae97e795a8cfcb1404a489f722ec0 100644 (file)
--- a/drivers/iio/proximity/vl53l0x-i2c.c
+++ b/drivers/iio/proximity/vl53l0x-i2c.c
@@ -351,8 +351,7 @@ static int vl53l0x_probe(struct i2c_client *client)
 
        error = devm_add_action_or_reset(&client->dev, vl53l0x_power_off, data);
        if (error)
-               return dev_err_probe(&client->dev, error,
-                                    "Failed to install poweroff action\n");
+               return ret;
 
        indio_dev->name = "vl53l0x";
        indio_dev->info = &vl53l0x_info;

diff --git a/drivers/iio/temperature/mlx90635.c b/drivers/iio/temperature/mlx90635.c
index f7f88498ba0e8d199888ab2992d75001235cfbb4..1175c7887ae18301d888f8c63719263f61650d24 100644 (file)
--- a/drivers/iio/temperature/mlx90635.c
+++ b/drivers/iio/temperature/mlx90635.c
@@ -977,8 +977,7 @@ static int mlx90635_probe(struct i2c_client *client)
        ret = devm_add_action_or_reset(&client->dev, mlx90635_disable_regulator,
                                       mlx90635);
        if (ret < 0)
-               return dev_err_probe(&client->dev, ret,
-                                    "failed to setup regulator cleanup action\n");
+               return ret;
 
        ret = mlx90635_wakeup(mlx90635);
        if (ret < 0)
@@ -986,8 +985,7 @@ static int mlx90635_probe(struct i2c_client *client)
 
        ret = devm_add_action_or_reset(&client->dev, mlx90635_sleep, mlx90635);
        if (ret < 0)
-               return dev_err_probe(&client->dev, ret,
-                                    "failed to setup low power cleanup\n");
+               return ret;
 
        ret = regmap_read(mlx90635->regmap_ee, MLX90635_EE_VERSION, &dsp_version);
        if (ret < 0)