iio: frequency: adf4377: 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/adf4377.c b/drivers/iio/frequency/adf4377.c
index c2ae6f2012ce19e64e02ae1bd0104d330a683bc8..ce3a396624c3adf1ef5f86514bb475d2e4519f18 100644 (file)
--- a/drivers/iio/frequency/adf4377.c
+++ b/drivers/iio/frequency/adf4377.c
@@ -706,23 +706,20 @@ static void adf4377_gpio_init(struct adf4377_state *st)
 
 static int adf4377_init(struct adf4377_state *st)
 {
-       struct spi_device *spi = st->spi;
+       struct device *dev = &st->spi->dev;
        int ret;
 
        adf4377_gpio_init(st);
 
        ret = adf4377_soft_reset(st);
-       if (ret) {
-               dev_err(&spi->dev, "Failed to soft reset.\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to soft reset.\n");
 
        ret = regmap_multi_reg_write(st->regmap, adf4377_reg_defaults,
                                     ARRAY_SIZE(adf4377_reg_defaults));
-       if (ret) {
-               dev_err(&spi->dev, "Failed to set default registers.\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret,
+                                    "Failed to set default registers.\n");
 
        ret = regmap_update_bits(st->regmap, 0x00,
                                 ADF4377_0000_SDO_ACTIVE_MSK | ADF4377_0000_SDO_ACTIVE_R_MSK,
@@ -730,10 +727,9 @@ static int adf4377_init(struct adf4377_state *st)
                                            ADF4377_0000_SDO_ACTIVE_SPI_4W) |
                                 FIELD_PREP(ADF4377_0000_SDO_ACTIVE_R_MSK,
                                            ADF4377_0000_SDO_ACTIVE_SPI_4W));
-       if (ret) {
-               dev_err(&spi->dev, "Failed to set 4-Wire Operation.\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret,
+                                    "Failed to set 4-Wire Operation.\n");
 
        st->clkin_freq = clk_get_rate(st->clkin);
 
@@ -747,10 +743,9 @@ static int adf4377_init(struct adf4377_state *st)
                           FIELD_PREP(ADF4377_001A_PD_PFDCP_MSK, 0) |
                           FIELD_PREP(ADF4377_001A_PD_CLKOUT1_MSK, 0) |
                           FIELD_PREP(ADF4377_001A_PD_CLKOUT2_MSK, 0));
-       if (ret) {
-               dev_err(&spi->dev, "Failed to set power down registers.\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret,
+                                    "Failed to set power down registers.\n");
 
        /* Set Mux Output */
        ret = regmap_update_bits(st->regmap, 0x1D,