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

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>

authored by

Waqar Hameed and committed by
Jonathan Cameron
65e8202f b515c701

+21 -36
+1 -1
drivers/iio/accel/msa311.c
··· 1195 1195 */ 1196 1196 err = devm_add_action_or_reset(dev, msa311_powerdown, msa311); 1197 1197 if (err) 1198 - return dev_err_probe(dev, err, "can't add powerdown action\n"); 1198 + return err; 1199 1199 1200 1200 err = pm_runtime_set_active(dev); 1201 1201 if (err)
+1 -2
drivers/iio/adc/ad4130.c
··· 2035 2035 2036 2036 ret = devm_add_action_or_reset(dev, ad4130_disable_regulators, st); 2037 2037 if (ret) 2038 - return dev_err_probe(dev, ret, 2039 - "Failed to add regulators disable action\n"); 2038 + return ret; 2040 2039 2041 2040 ret = ad4130_soft_reset(st); 2042 2041 if (ret)
+1 -1
drivers/iio/adc/ad7124.c
··· 1300 1300 ret = devm_add_action_or_reset(&spi->dev, ad7124_reg_disable, 1301 1301 st->vref[i]); 1302 1302 if (ret) 1303 - return dev_err_probe(dev, ret, "Failed to register disable handler for regulator #%d\n", i); 1303 + return ret; 1304 1304 } 1305 1305 1306 1306 st->mclk = devm_clk_get_enabled(&spi->dev, "mclk");
+1 -2
drivers/iio/adc/ad7173.c
··· 1731 1731 1732 1732 ret = devm_add_action_or_reset(dev, ad7173_disable_regulators, st); 1733 1733 if (ret) 1734 - return dev_err_probe(dev, ret, 1735 - "Failed to add regulators disable action\n"); 1734 + return ret; 1736 1735 1737 1736 ret = device_property_match_property_string(dev, "clock-names", 1738 1737 ad7173_clk_sel,
+1 -2
drivers/iio/adc/mt6577_auxadc.c
··· 297 297 298 298 ret = devm_add_action_or_reset(&pdev->dev, mt6577_power_off, adc_dev); 299 299 if (ret) 300 - return dev_err_probe(&pdev->dev, ret, 301 - "Failed to add action to managed power off\n"); 300 + return ret; 302 301 303 302 ret = devm_iio_device_register(&pdev->dev, indio_dev); 304 303 if (ret < 0)
+1 -2
drivers/iio/adc/pac1921.c
··· 1279 1279 ret = devm_add_action_or_reset(dev, pac1921_regulator_disable, 1280 1280 priv->vdd); 1281 1281 if (ret) 1282 - return dev_err_probe(dev, ret, 1283 - "Cannot add action for vdd regulator disposal\n"); 1282 + return ret; 1284 1283 1285 1284 msleep(PAC1921_POWERUP_TIME_MS); 1286 1285
+1 -2
drivers/iio/adc/rockchip_saradc.c
··· 527 527 ret = devm_add_action_or_reset(&pdev->dev, 528 528 rockchip_saradc_regulator_disable, info); 529 529 if (ret) 530 - return dev_err_probe(&pdev->dev, ret, 531 - "failed to register devm action\n"); 530 + return ret; 532 531 533 532 ret = regulator_get_voltage(info->vref); 534 533 if (ret < 0)
+1 -2
drivers/iio/adc/ti-ads1119.c
··· 778 778 779 779 ret = devm_add_action_or_reset(dev, ads1119_powerdown, st); 780 780 if (ret) 781 - return dev_err_probe(dev, ret, 782 - "Failed to add powerdown action\n"); 781 + return ret; 783 782 784 783 return devm_iio_device_register(dev, indio_dev); 785 784 }
+2 -4
drivers/iio/adc/ti-ads7924.c
··· 399 399 400 400 ret = devm_add_action_or_reset(dev, ads7924_reg_disable, data->vref_reg); 401 401 if (ret) 402 - return dev_err_probe(dev, ret, 403 - "failed to add regulator disable action\n"); 402 + return ret; 404 403 405 404 ret = ads7924_reset(indio_dev); 406 405 if (ret < 0) ··· 413 414 414 415 ret = devm_add_action_or_reset(dev, ads7924_set_idle_mode, data); 415 416 if (ret) 416 - return dev_err_probe(dev, ret, 417 - "failed to add idle mode action\n"); 417 + return ret; 418 418 419 419 /* Use minimum signal acquire time. */ 420 420 ret = regmap_update_bits(data->regmap, ADS7924_ACQCONFIG_REG,
+1 -2
drivers/iio/frequency/adf4350.c
··· 673 673 674 674 ret = devm_add_action_or_reset(&spi->dev, adf4350_power_down, indio_dev); 675 675 if (ret) 676 - return dev_err_probe(&spi->dev, ret, 677 - "Failed to add action to managed power down\n"); 676 + return ret; 678 677 679 678 return devm_iio_device_register(&spi->dev, indio_dev); 680 679 }
+1 -1
drivers/iio/light/al3000a.c
··· 94 94 95 95 ret = devm_add_action_or_reset(dev, al3000a_set_pwr_off, data); 96 96 if (ret) 97 - return dev_err_probe(dev, ret, "failed to add action\n"); 97 + return ret; 98 98 99 99 ret = regmap_write(data->regmap, AL3000A_REG_SYSTEM, AL3000A_CONFIG_RESET); 100 100 if (ret)
+1 -1
drivers/iio/light/apds9306.c
··· 1309 1309 1310 1310 ret = devm_add_action_or_reset(dev, apds9306_powerdown, data); 1311 1311 if (ret) 1312 - return dev_err_probe(dev, ret, "failed to add action or reset\n"); 1312 + return ret; 1313 1313 1314 1314 ret = devm_iio_device_register(dev, indio_dev); 1315 1315 if (ret)
+1 -2
drivers/iio/light/bh1745.c
··· 814 814 815 815 ret = devm_add_action_or_reset(dev, bh1745_power_off, data); 816 816 if (ret) 817 - return dev_err_probe(dev, ret, 818 - "Failed to add action or reset\n"); 817 + return ret; 819 818 820 819 return 0; 821 820 }
+1 -2
drivers/iio/light/opt4001.c
··· 428 428 opt4001_chip_off_action, 429 429 chip); 430 430 if (ret < 0) 431 - return dev_err_probe(&client->dev, ret, 432 - "Failed to setup power off action\n"); 431 + return ret; 433 432 434 433 return devm_iio_device_register(&client->dev, indio_dev); 435 434 }
+1 -2
drivers/iio/light/opt4060.c
··· 1299 1299 1300 1300 ret = devm_add_action_or_reset(dev, opt4060_chip_off_action, chip); 1301 1301 if (ret < 0) 1302 - return dev_err_probe(dev, ret, 1303 - "Failed to setup power off action\n"); 1302 + return ret; 1304 1303 1305 1304 ret = opt4060_setup_buffer(chip, indio_dev); 1306 1305 if (ret)
+1 -1
drivers/iio/magnetometer/als31300.c
··· 373 373 374 374 ret = devm_add_action_or_reset(dev, als31300_power_down, data); 375 375 if (ret) 376 - return dev_err_probe(dev, ret, "failed to add powerdown action\n"); 376 + return ret; 377 377 378 378 indio_dev->info = &als31300_info; 379 379 indio_dev->modes = INDIO_DIRECT_MODE;
+1 -1
drivers/iio/magnetometer/tmag5273.c
··· 642 642 */ 643 643 ret = devm_add_action_or_reset(dev, tmag5273_power_down, data); 644 644 if (ret) 645 - return dev_err_probe(dev, ret, "failed to add powerdown action\n"); 645 + return ret; 646 646 647 647 ret = pm_runtime_set_active(dev); 648 648 if (ret < 0)
+1 -2
drivers/iio/proximity/vl53l0x-i2c.c
··· 351 351 352 352 error = devm_add_action_or_reset(&client->dev, vl53l0x_power_off, data); 353 353 if (error) 354 - return dev_err_probe(&client->dev, error, 355 - "Failed to install poweroff action\n"); 354 + return ret; 356 355 357 356 indio_dev->name = "vl53l0x"; 358 357 indio_dev->info = &vl53l0x_info;
+2 -4
drivers/iio/temperature/mlx90635.c
··· 977 977 ret = devm_add_action_or_reset(&client->dev, mlx90635_disable_regulator, 978 978 mlx90635); 979 979 if (ret < 0) 980 - return dev_err_probe(&client->dev, ret, 981 - "failed to setup regulator cleanup action\n"); 980 + return ret; 982 981 983 982 ret = mlx90635_wakeup(mlx90635); 984 983 if (ret < 0) ··· 985 986 986 987 ret = devm_add_action_or_reset(&client->dev, mlx90635_sleep, mlx90635); 987 988 if (ret < 0) 988 - return dev_err_probe(&client->dev, ret, 989 - "failed to setup low power cleanup\n"); 989 + return ret; 990 990 991 991 ret = regmap_read(mlx90635->regmap_ee, MLX90635_EE_VERSION, &dsp_version); 992 992 if (ret < 0)