Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: frequency: admv1013: 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
9e9f38c4
e61b5bb0
+5
-9
+5
-9
drivers/iio/frequency/admv1013.c
+5
-9
drivers/iio/frequency/admv1013.c
···
441
441
{
442
442
int ret;
443
443
unsigned int data;
444
-
struct spi_device *spi = st->spi;
444
+
struct device *dev = &st->spi->dev;
445
445
446
446
/* Perform a software reset */
447
447
ret = __admv1013_spi_update_bits(st, ADMV1013_REG_SPI_CONTROL,
···
461
461
return ret;
462
462
463
463
data = FIELD_GET(ADMV1013_CHIP_ID_MSK, data);
464
-
if (data != ADMV1013_CHIP_ID) {
465
-
dev_err(&spi->dev, "Invalid Chip ID.\n");
466
-
return -EINVAL;
467
-
}
464
+
if (data != ADMV1013_CHIP_ID)
465
+
return dev_err_probe(dev, -EINVAL, "Invalid Chip ID.\n");
468
466
469
467
ret = __admv1013_spi_write(st, ADMV1013_REG_VVA_TEMP_COMP, 0xE700);
470
468
if (ret)
···
600
602
mutex_init(&st->lock);
601
603
602
604
ret = admv1013_init(st, vcm_uv);
603
-
if (ret) {
604
-
dev_err(&spi->dev, "admv1013 init failed\n");
605
-
return ret;
606
-
}
605
+
if (ret)
606
+
return dev_err_probe(dev, ret, "admv1013 init failed\n");
607
607
608
608
ret = devm_add_action_or_reset(dev, admv1013_powerdown, st);
609
609
if (ret)