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: filter: admv8818: 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 82035b16 008120ca

+14 -21
+14 -21
drivers/iio/filter/admv8818.c
··· 657 657 static int admv8818_init(struct admv8818_state *st) 658 658 { 659 659 int ret; 660 - struct spi_device *spi = st->spi; 660 + struct device *dev = &st->spi->dev; 661 661 unsigned int chip_id; 662 662 663 663 ret = regmap_write(st->regmap, ADMV8818_REG_SPI_CONFIG_A, 664 664 ADMV8818_SOFTRESET_N_MSK | ADMV8818_SOFTRESET_MSK); 665 - if (ret) { 666 - dev_err(&spi->dev, "ADMV8818 Soft Reset failed.\n"); 667 - return ret; 668 - } 665 + if (ret) 666 + return dev_err_probe(dev, ret, "ADMV8818 Soft Reset failed.\n"); 669 667 670 668 ret = regmap_write(st->regmap, ADMV8818_REG_SPI_CONFIG_A, 671 669 ADMV8818_SDOACTIVE_N_MSK | ADMV8818_SDOACTIVE_MSK); 672 - if (ret) { 673 - dev_err(&spi->dev, "ADMV8818 SDO Enable failed.\n"); 674 - return ret; 675 - } 670 + if (ret) 671 + return dev_err_probe(dev, ret, "ADMV8818 SDO Enable failed.\n"); 676 672 677 673 ret = regmap_read(st->regmap, ADMV8818_REG_CHIPTYPE, &chip_id); 678 - if (ret) { 679 - dev_err(&spi->dev, "ADMV8818 Chip ID read failed.\n"); 680 - return ret; 681 - } 674 + if (ret) 675 + return dev_err_probe(dev, ret, 676 + "ADMV8818 Chip ID read failed.\n"); 682 677 683 - if (chip_id != 0x1) { 684 - dev_err(&spi->dev, "ADMV8818 Invalid Chip ID.\n"); 685 - return -EINVAL; 686 - } 678 + if (chip_id != 0x1) 679 + return dev_err_probe(dev, -EINVAL, 680 + "ADMV8818 Invalid Chip ID.\n"); 687 681 688 682 ret = regmap_update_bits(st->regmap, ADMV8818_REG_SPI_CONFIG_B, 689 683 ADMV8818_SINGLE_INSTRUCTION_MSK, 690 684 FIELD_PREP(ADMV8818_SINGLE_INSTRUCTION_MSK, 1)); 691 - if (ret) { 692 - dev_err(&spi->dev, "ADMV8818 Single Instruction failed.\n"); 693 - return ret; 694 - } 685 + if (ret) 686 + return dev_err_probe(dev, ret, 687 + "ADMV8818 Single Instruction failed.\n"); 695 688 696 689 if (st->clkin) 697 690 return admv8818_rfin_band_select(st);