tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: frequency: admv4420: use dev_err_probe

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>

authored by

Antoniu Miclaus and committed by
Jonathan Cameron 7428168f e81f3889

+12 -16
+12 -16
drivers/iio/frequency/admv4420.c
··· 279 279 if (ret) 280 280 return ret; 281 281 282 - if (val != ADMV4420_SCRATCH_PAD_VAL_1) { 283 - dev_err(dev, "Failed ADMV4420 to read/write scratchpad %x ", val); 284 - return -EIO; 285 - } 282 + if (val != ADMV4420_SCRATCH_PAD_VAL_1) 283 + return dev_err_probe(dev, -EIO, 284 + "Failed ADMV4420 to read/write scratchpad %x\n", val); 286 285 287 286 ret = regmap_write(st->regmap, 288 287 ADMV4420_SCRATCHPAD, ··· 293 294 if (ret) 294 295 return ret; 295 296 296 - if (val != ADMV4420_SCRATCH_PAD_VAL_2) { 297 - dev_err(dev, "Failed to read/write scratchpad %x ", val); 298 - return -EIO; 299 - } 297 + if (val != ADMV4420_SCRATCH_PAD_VAL_2) 298 + return dev_err_probe(dev, -EIO, 299 + "Failed to read/write scratchpad %x\n", val); 300 300 301 301 st->mux_sel = ADMV4420_LOCK_DTCT; 302 302 st->lo_freq_hz = ADMV4420_DEFAULT_LO_FREQ_HZ; ··· 303 305 admv4420_fw_parse(st); 304 306 305 307 ret = admv4420_calc_parameters(st); 306 - if (ret) { 307 - dev_err(dev, "Failed calc parameters for %lld ", st->vco_freq_hz); 308 - return ret; 309 - } 308 + if (ret) 309 + return dev_err_probe(dev, ret, 310 + "Failed calc parameters for %llu\n", 311 + st->vco_freq_hz); 310 312 311 313 ret = regmap_write(st->regmap, ADMV4420_R_DIV_L, 312 314 FIELD_GET(0xFF, st->ref_block.divider)); ··· 367 369 indio_dev->num_channels = ARRAY_SIZE(admv4420_channels); 368 370 369 371 ret = admv4420_setup(indio_dev); 370 - if (ret) { 371 - dev_err(&spi->dev, "Setup ADMV4420 failed (%d)\n", ret); 372 - return ret; 373 - } 372 + if (ret) 373 + return dev_err_probe(dev, ret, "Setup ADMV4420 failed\n"); 374 374 375 375 return devm_iio_device_register(dev, indio_dev); 376 376 }