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

iio: chemical: scd30_core: Switch to use dev_err_probe()

Switch to use dev_err_probe() to simplify the error paths and
unify message template.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230113141917.23725-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Andy Shevchenko and committed by
Jonathan Cameron
c44e031b ebda75fb

+14 -26
+14 -26
drivers/iio/chemical/scd30_core.c
··· 642 642 643 643 trig = devm_iio_trigger_alloc(dev, "%s-dev%d", indio_dev->name, 644 644 iio_device_id(indio_dev)); 645 - if (!trig) { 646 - dev_err(dev, "failed to allocate trigger\n"); 647 - return -ENOMEM; 648 - } 645 + if (!trig) 646 + return dev_err_probe(dev, -ENOMEM, "failed to allocate trigger\n"); 649 647 650 648 trig->ops = &scd30_trigger_ops; 651 649 iio_trigger_set_drvdata(trig, indio_dev); ··· 665 667 IRQF_NO_AUTOEN, 666 668 indio_dev->name, indio_dev); 667 669 if (ret) 668 - dev_err(dev, "failed to request irq\n"); 670 + return dev_err_probe(dev, ret, "failed to request irq\n"); 669 671 670 - return ret; 672 + return 0; 671 673 } 672 674 673 675 int scd30_probe(struct device *dev, int irq, const char *name, void *priv, ··· 715 717 return ret; 716 718 717 719 ret = scd30_reset(state); 718 - if (ret) { 719 - dev_err(dev, "failed to reset device: %d\n", ret); 720 - return ret; 721 - } 720 + if (ret) 721 + return dev_err_probe(dev, ret, "failed to reset device\n"); 722 722 723 723 if (state->irq > 0) { 724 724 ret = scd30_setup_trigger(indio_dev); 725 - if (ret) { 726 - dev_err(dev, "failed to setup trigger: %d\n", ret); 727 - return ret; 728 - } 725 + if (ret) 726 + return dev_err_probe(dev, ret, "failed to setup trigger\n"); 729 727 } 730 728 731 729 ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, scd30_trigger_handler, NULL); ··· 729 735 return ret; 730 736 731 737 ret = scd30_command_read(state, CMD_FW_VERSION, &val); 732 - if (ret) { 733 - dev_err(dev, "failed to read firmware version: %d\n", ret); 734 - return ret; 735 - } 738 + if (ret) 739 + return dev_err_probe(dev, ret, "failed to read firmware version\n"); 736 740 dev_info(dev, "firmware version: %d.%d\n", val >> 8, (char)val); 737 741 738 742 ret = scd30_command_write(state, CMD_MEAS_INTERVAL, state->meas_interval); 739 - if (ret) { 740 - dev_err(dev, "failed to set measurement interval: %d\n", ret); 741 - return ret; 742 - } 743 + if (ret) 744 + return dev_err_probe(dev, ret, "failed to set measurement interval\n"); 743 745 744 746 ret = scd30_command_write(state, CMD_START_MEAS, state->pressure_comp); 745 - if (ret) { 746 - dev_err(dev, "failed to start measurement: %d\n", ret); 747 - return ret; 748 - } 747 + if (ret) 748 + return dev_err_probe(dev, ret, "failed to start measurement\n"); 749 749 750 750 ret = devm_add_action_or_reset(dev, scd30_stop_meas, state); 751 751 if (ret)