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

Configure Feed

Select the types of activity you want to include in your feed.

iio: frequency: admv1014: use dev_err_probe()

Use dev_err_probe() consistently in the probe path to simplify error
handling and ensure deferred probes are logged correctly.

Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Antoniu Miclaus and committed by
Jonathan Cameron b343f010 4ced084b

+24 -36
+24 -36
drivers/iio/frequency/admv1014.c
··· 614 614 int ret; 615 615 616 616 ret = regulator_bulk_enable(ADMV1014_NUM_REGULATORS, st->regulators); 617 - if (ret) { 618 - dev_err(&spi->dev, "Failed to enable regulators"); 619 - return ret; 620 - } 617 + if (ret) 618 + return dev_err_probe(dev, ret, "Failed to enable regulators"); 621 619 622 620 ret = devm_add_action_or_reset(dev, admv1014_reg_disable, st->regulators); 623 621 if (ret) ··· 642 644 ret = __admv1014_spi_update_bits(st, ADMV1014_REG_SPI_CONTROL, 643 645 ADMV1014_SPI_SOFT_RESET_MSK, 644 646 FIELD_PREP(ADMV1014_SPI_SOFT_RESET_MSK, 1)); 645 - if (ret) { 646 - dev_err(&spi->dev, "ADMV1014 SPI software reset failed.\n"); 647 - return ret; 648 - } 647 + if (ret) 648 + return dev_err_probe(dev, ret, 649 + "ADMV1014 SPI software reset failed.\n"); 649 650 650 651 ret = __admv1014_spi_update_bits(st, ADMV1014_REG_SPI_CONTROL, 651 652 ADMV1014_SPI_SOFT_RESET_MSK, 652 653 FIELD_PREP(ADMV1014_SPI_SOFT_RESET_MSK, 0)); 653 - if (ret) { 654 - dev_err(&spi->dev, "ADMV1014 SPI software reset disable failed.\n"); 655 - return ret; 656 - } 654 + if (ret) 655 + return dev_err_probe(dev, ret, 656 + "ADMV1014 SPI software reset disable failed.\n"); 657 657 658 658 ret = __admv1014_spi_write(st, ADMV1014_REG_VVA_TEMP_COMP, 0x727C); 659 - if (ret) { 660 - dev_err(&spi->dev, "Writing default Temperature Compensation value failed.\n"); 661 - return ret; 662 - } 659 + if (ret) 660 + return dev_err_probe(dev, ret, 661 + "Writing default Temperature Compensation value failed.\n"); 663 662 664 663 ret = __admv1014_spi_read(st, ADMV1014_REG_SPI_CONTROL, &chip_id); 665 664 if (ret) 666 665 return ret; 667 666 668 667 chip_id = FIELD_GET(ADMV1014_CHIP_ID_MSK, chip_id); 669 - if (chip_id != ADMV1014_CHIP_ID) { 670 - dev_err(&spi->dev, "Invalid Chip ID.\n"); 671 - return -EINVAL; 672 - } 668 + if (chip_id != ADMV1014_CHIP_ID) 669 + return dev_err_probe(dev, -EINVAL, "Invalid Chip ID.\n"); 673 670 674 671 ret = __admv1014_spi_update_bits(st, ADMV1014_REG_QUAD, 675 672 ADMV1014_QUAD_SE_MODE_MSK, 676 673 FIELD_PREP(ADMV1014_QUAD_SE_MODE_MSK, 677 674 st->quad_se_mode)); 678 - if (ret) { 679 - dev_err(&spi->dev, "Writing Quad SE Mode failed.\n"); 680 - return ret; 681 - } 675 + if (ret) 676 + return dev_err_probe(dev, ret, 677 + "Writing Quad SE Mode failed.\n"); 682 678 683 679 ret = admv1014_update_quad_filters(st); 684 - if (ret) { 685 - dev_err(&spi->dev, "Update Quad Filters failed.\n"); 686 - return ret; 687 - } 680 + if (ret) 681 + return dev_err_probe(dev, ret, 682 + "Update Quad Filters failed.\n"); 688 683 689 684 ret = admv1014_update_vcm_settings(st); 690 - if (ret) { 691 - dev_err(&spi->dev, "Update VCM Settings failed.\n"); 692 - return ret; 693 - } 685 + if (ret) 686 + return dev_err_probe(dev, ret, 687 + "Update VCM Settings failed.\n"); 694 688 695 689 enable_reg_msk = ADMV1014_P1DB_COMPENSATION_MSK | 696 690 ADMV1014_IF_AMP_PD_MSK | ··· 731 741 732 742 ret = devm_regulator_bulk_get(dev, ADMV1014_NUM_REGULATORS, 733 743 st->regulators); 734 - if (ret) { 735 - dev_err(&spi->dev, "Failed to request regulators"); 736 - return ret; 737 - } 744 + if (ret) 745 + return dev_err_probe(dev, ret, "Failed to request regulators"); 738 746 739 747 st->clkin = devm_clk_get(dev, "lo_in"); 740 748 if (IS_ERR(st->clkin))