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>

diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
index 974c5bd923a685f92534f629a591590f3728ba04..7fb3ab4a42569381f4a407851c940ebb9e5fb9cd 100644 (file)
--- a/drivers/iio/adc/mcp3911.c
+++ b/drivers/iio/adc/mcp3911.c
@@ -277,10 +277,7 @@ static int mcp3911_calc_scale_table(struct mcp3911 *adc)
        if (adc->vref) {
                ret = regulator_get_voltage(adc->vref);
                if (ret < 0) {
-                       dev_err(&adc->spi->dev,
-                               "failed to get vref voltage: %d\n",
-                              ret);
-                       return ret;
+                       return dev_err_probe(&adc->spi->dev, ret, "failed to get vref voltage\n");
                }
 
                ref = ret / 1000;
@@ -396,10 +393,9 @@ static int mcp3911_config(struct mcp3911 *adc)
        if (ret)
                device_property_read_u32(dev, "device-addr", &adc->dev_addr);
        if (adc->dev_addr > 3) {
-               dev_err(&adc->spi->dev,
-                       "invalid device address (%i). Must be in range 0-3.\n",
-                       adc->dev_addr);
-               return -EINVAL;
+               return dev_err_probe(dev, -EINVAL,
+                                    "invalid device address (%i). Must be in range 0-3.\n",
+                                    adc->dev_addr);
        }
        dev_dbg(&adc->spi->dev, "use device address %i\n", adc->dev_addr);
 
@@ -466,6 +462,7 @@ static const struct iio_trigger_ops mcp3911_trigger_ops = {
 
 static int mcp3911_probe(struct spi_device *spi)
 {
+       struct device *dev = &spi->dev;
        struct iio_dev *indio_dev;
        struct mcp3911 *adc;
        int ret;
@@ -482,10 +479,7 @@ static int mcp3911_probe(struct spi_device *spi)
                if (PTR_ERR(adc->vref) == -ENODEV) {
                        adc->vref = NULL;
                } else {
-                       dev_err(&adc->spi->dev,
-                               "failed to get regulator (%ld)\n",
-                               PTR_ERR(adc->vref));
-                       return PTR_ERR(adc->vref);
+                       return dev_err_probe(dev, PTR_ERR(adc->vref), "failed to get regulator\n");
                }
 
        } else {
@@ -504,10 +498,7 @@ static int mcp3911_probe(struct spi_device *spi)
                if (PTR_ERR(adc->clki) == -ENOENT) {
                        adc->clki = NULL;
                } else {
-                       dev_err(&adc->spi->dev,
-                               "failed to get adc clk (%ld)\n",
-                               PTR_ERR(adc->clki));
-                       return PTR_ERR(adc->clki);
+                       return dev_err_probe(dev, PTR_ERR(adc->clki), "failed to get adc clk\n");
                }
        }