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>

diff --git a/drivers/iio/frequency/admv1013.c b/drivers/iio/frequency/admv1013.c
index d29e288da011aa2bc7f715f3508403f092e179fc..9202443ef44527934be1fa51194a2713dfcf2036 100644 (file)
--- a/drivers/iio/frequency/admv1013.c
+++ b/drivers/iio/frequency/admv1013.c
@@ -441,7 +441,7 @@ static int admv1013_init(struct admv1013_state *st, int vcm_uv)
 {
        int ret;
        unsigned int data;
-       struct spi_device *spi = st->spi;
+       struct device *dev = &st->spi->dev;
 
        /* Perform a software reset */
        ret = __admv1013_spi_update_bits(st, ADMV1013_REG_SPI_CONTROL,
@@ -461,10 +461,8 @@ static int admv1013_init(struct admv1013_state *st, int vcm_uv)
                return ret;
 
        data = FIELD_GET(ADMV1013_CHIP_ID_MSK, data);
-       if (data != ADMV1013_CHIP_ID) {
-               dev_err(&spi->dev, "Invalid Chip ID.\n");
-               return -EINVAL;
-       }
+       if (data != ADMV1013_CHIP_ID)
+               return dev_err_probe(dev, -EINVAL, "Invalid Chip ID.\n");
 
        ret = __admv1013_spi_write(st, ADMV1013_REG_VVA_TEMP_COMP, 0xE700);
        if (ret)
@@ -602,10 +600,8 @@ static int admv1013_probe(struct spi_device *spi)
        mutex_init(&st->lock);
 
        ret = admv1013_init(st, vcm_uv);
-       if (ret) {
-               dev_err(&spi->dev, "admv1013 init failed\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "admv1013 init failed\n");
 
        ret = devm_add_action_or_reset(dev, admv1013_powerdown, st);
        if (ret)