iio: adc: rockchip_saradc: Use dev_err_probe
authorShreeya Patel <shreeya.patel@collabora.com>
Sat, 3 Jun 2023 18:53:38 +0000 (00:23 +0530)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 4 Jun 2023 10:24:13 +0000 (11:24 +0100)
Use dev_err_probe instead of dev_err in probe function,
which simplifies code a little bit and prints the error
code.

Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230603185340.13838-7-shreeya.patel@collabora.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/rockchip_saradc.c

index 7883394fdbcacf7dfaa9b7ee6dac1c68d1dc744c..4b011f7eddec3a61abb92bce55ffc50457db1d04 100644 (file)
@@ -425,25 +425,23 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
                return -ENODEV;
 
        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info));
-       if (!indio_dev) {
-               dev_err(&pdev->dev, "failed allocating iio device\n");
-               return -ENOMEM;
-       }
+       if (!indio_dev)
+               return dev_err_probe(&pdev->dev, -ENOMEM,
+                                    "failed allocating iio device\n");
+
        info = iio_priv(indio_dev);
 
        match_data = of_device_get_match_data(&pdev->dev);
-       if (!match_data) {
-               dev_err(&pdev->dev, "failed to match device\n");
-               return -ENODEV;
-       }
+       if (!match_data)
+               return dev_err_probe(&pdev->dev, -ENODEV,
+                                    "failed to match device\n");
 
        info->data = match_data;
 
        /* Sanity check for possible later IP variants with more channels */
-       if (info->data->num_channels > SARADC_MAX_CHANNELS) {
-               dev_err(&pdev->dev, "max channels exceeded");
-               return -EINVAL;
-       }
+       if (info->data->num_channels > SARADC_MAX_CHANNELS)
+               return dev_err_probe(&pdev->dev, -EINVAL,
+                                    "max channels exceeded");
 
        info->regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(info->regs))
@@ -491,23 +489,20 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
         * This may become user-configurable in the future.
         */
        ret = clk_set_rate(info->clk, info->data->clk_rate);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to set adc clk rate, %d\n", ret);
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "failed to set adc clk rate\n");
 
        ret = regulator_enable(info->vref);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to enable vref regulator\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "failed to enable vref regulator\n");
+
        ret = devm_add_action_or_reset(&pdev->dev,
                                       rockchip_saradc_regulator_disable, info);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to register devm action, %d\n",
-                       ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "failed to register devm action\n");
 
        ret = regulator_get_voltage(info->vref);
        if (ret < 0)