Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Antoniu Miclaus
and committed by
Jonathan Cameron
3e1c0b95
b2d2a6ea
+12
-17
+12
-17
drivers/iio/frequency/adf4377.c
+12
-17
drivers/iio/frequency/adf4377.c
···
706
706
707
707
static int adf4377_init(struct adf4377_state *st)
708
708
{
709
-
struct spi_device *spi = st->spi;
709
+
struct device *dev = &st->spi->dev;
710
710
int ret;
711
711
712
712
adf4377_gpio_init(st);
713
713
714
714
ret = adf4377_soft_reset(st);
715
-
if (ret) {
716
-
dev_err(&spi->dev, "Failed to soft reset.\n");
717
-
return ret;
718
-
}
715
+
if (ret)
716
+
return dev_err_probe(dev, ret, "Failed to soft reset.\n");
719
717
720
718
ret = regmap_multi_reg_write(st->regmap, adf4377_reg_defaults,
721
719
ARRAY_SIZE(adf4377_reg_defaults));
722
-
if (ret) {
723
-
dev_err(&spi->dev, "Failed to set default registers.\n");
724
-
return ret;
725
-
}
720
+
if (ret)
721
+
return dev_err_probe(dev, ret,
722
+
"Failed to set default registers.\n");
726
723
727
724
ret = regmap_update_bits(st->regmap, 0x00,
728
725
ADF4377_0000_SDO_ACTIVE_MSK | ADF4377_0000_SDO_ACTIVE_R_MSK,
···
727
730
ADF4377_0000_SDO_ACTIVE_SPI_4W) |
728
731
FIELD_PREP(ADF4377_0000_SDO_ACTIVE_R_MSK,
729
732
ADF4377_0000_SDO_ACTIVE_SPI_4W));
730
-
if (ret) {
731
-
dev_err(&spi->dev, "Failed to set 4-Wire Operation.\n");
732
-
return ret;
733
-
}
733
+
if (ret)
734
+
return dev_err_probe(dev, ret,
735
+
"Failed to set 4-Wire Operation.\n");
734
736
735
737
st->clkin_freq = clk_get_rate(st->clkin);
736
738
···
743
747
FIELD_PREP(ADF4377_001A_PD_PFDCP_MSK, 0) |
744
748
FIELD_PREP(ADF4377_001A_PD_CLKOUT1_MSK, 0) |
745
749
FIELD_PREP(ADF4377_001A_PD_CLKOUT2_MSK, 0));
746
-
if (ret) {
747
-
dev_err(&spi->dev, "Failed to set power down registers.\n");
748
-
return ret;
749
-
}
750
+
if (ret)
751
+
return dev_err_probe(dev, ret,
752
+
"Failed to set power down registers.\n");
750
753
751
754
/* Set Mux Output */
752
755
ret = regmap_update_bits(st->regmap, 0x1D,