Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: adc: mcp3911: make use of dev_err_probe()
Simplify code by switch to dev_err_probe().
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Link: https://lore.kernel.org/r/20230822192259.1125792-3-marcus.folkesson@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Marcus Folkesson
and committed by
Jonathan Cameron
46d1bfa0
655be10d
+7
-16
+7
-16
drivers/iio/adc/mcp3911.c
+7
-16
drivers/iio/adc/mcp3911.c
···
277
277
if (adc->vref) {
278
278
ret = regulator_get_voltage(adc->vref);
279
279
if (ret < 0) {
280
-
dev_err(&adc->spi->dev,
281
-
"failed to get vref voltage: %d\n",
282
-
ret);
283
-
return ret;
280
+
return dev_err_probe(&adc->spi->dev, ret, "failed to get vref voltage\n");
284
281
}
285
282
286
283
ref = ret / 1000;
···
393
396
if (ret)
394
397
device_property_read_u32(dev, "device-addr", &adc->dev_addr);
395
398
if (adc->dev_addr > 3) {
396
-
dev_err(&adc->spi->dev,
397
-
"invalid device address (%i). Must be in range 0-3.\n",
398
-
adc->dev_addr);
399
-
return -EINVAL;
399
+
return dev_err_probe(dev, -EINVAL,
400
+
"invalid device address (%i). Must be in range 0-3.\n",
401
+
adc->dev_addr);
400
402
}
401
403
dev_dbg(&adc->spi->dev, "use device address %i\n", adc->dev_addr);
402
404
···
462
466
463
467
static int mcp3911_probe(struct spi_device *spi)
464
468
{
469
+
struct device *dev = &spi->dev;
465
470
struct iio_dev *indio_dev;
466
471
struct mcp3911 *adc;
467
472
int ret;
···
479
482
if (PTR_ERR(adc->vref) == -ENODEV) {
480
483
adc->vref = NULL;
481
484
} else {
482
-
dev_err(&adc->spi->dev,
483
-
"failed to get regulator (%ld)\n",
484
-
PTR_ERR(adc->vref));
485
-
return PTR_ERR(adc->vref);
485
+
return dev_err_probe(dev, PTR_ERR(adc->vref), "failed to get regulator\n");
486
486
}
487
487
488
488
} else {
···
498
504
if (PTR_ERR(adc->clki) == -ENOENT) {
499
505
adc->clki = NULL;
500
506
} else {
501
-
dev_err(&adc->spi->dev,
502
-
"failed to get adc clk (%ld)\n",
503
-
PTR_ERR(adc->clki));
504
-
return PTR_ERR(adc->clki);
507
+
return dev_err_probe(dev, PTR_ERR(adc->clki), "failed to get adc clk\n");
505
508
}
506
509
}
507
510