mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 10:11:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

iio: frequency: admv4420: use dev_err_probe

Browse Source 
Use dev_err_probe() instead of dev_err() in the probe path to ensure
proper handling of deferred probing and to simplify error handling.

Also fix the format specifier for vco_freq_hz from %lld to %llu since
it is u64 (unsigned), and add missing newline to the error message.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Antoniu Miclaus
2026-03-13 13:57:42 +02:00
committed by Jonathan Cameron
parent e81f3889c2
commit 7428168fe1
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/iio/frequency/admv4420.c
View File

@@ -279,10 +279,9 @@ static int admv4420_setup(struct iio_dev *indio_dev)
if (ret)
return ret;
if (val != ADMV4420_SCRATCH_PAD_VAL_1) {
dev_err(dev, "Failed ADMV4420 to read/write scratchpad %x ", val);
return -EIO;
}
if (val != ADMV4420_SCRATCH_PAD_VAL_1)
return dev_err_probe(dev, -EIO,
"Failed ADMV4420 to read/write scratchpad %x\n", val);
ret = regmap_write(st->regmap,
ADMV4420_SCRATCHPAD,
@@ -294,10 +293,9 @@ static int admv4420_setup(struct iio_dev *indio_dev)
if (ret)
return ret;
if (val != ADMV4420_SCRATCH_PAD_VAL_2) {
dev_err(dev, "Failed to read/write scratchpad %x ", val);
return -EIO;
}
if (val != ADMV4420_SCRATCH_PAD_VAL_2)
return dev_err_probe(dev, -EIO,
"Failed to read/write scratchpad %x\n", val);
st->mux_sel = ADMV4420_LOCK_DTCT;
st->lo_freq_hz = ADMV4420_DEFAULT_LO_FREQ_HZ;
@@ -305,10 +303,10 @@ static int admv4420_setup(struct iio_dev *indio_dev)
admv4420_fw_parse(st);
ret = admv4420_calc_parameters(st);
if (ret) {
dev_err(dev, "Failed calc parameters for %lld ", st->vco_freq_hz);
return ret;
}
if (ret)
return dev_err_probe(dev, ret,
"Failed calc parameters for %llu\n",
st->vco_freq_hz);
ret = regmap_write(st->regmap, ADMV4420_R_DIV_L,
FIELD_GET(0xFF, st->ref_block.divider));
@@ -369,10 +367,8 @@ static int admv4420_probe(struct spi_device *spi)
indio_dev->num_channels = ARRAY_SIZE(admv4420_channels);
ret = admv4420_setup(indio_dev);
if (ret) {
dev_err(&spi->dev, "Setup ADMV4420 failed (%d)\n", ret);
return ret;
}
if (ret)
return dev_err_probe(dev, ret, "Setup ADMV4420 failed\n");
return devm_iio_device_register(dev, indio_dev);
}