92 lines
2.8 KiB
Diff
92 lines
2.8 KiB
Diff
|
From 29c37c730e74353a89a6a30d507a9e56ff750937 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Shreeya Patel <shreeya.patel@collabora.com>
|
||
|
|
Date: Thu, 4 May 2023 18:28:14 +0530
|
||
|
|
Subject: [PATCH 441/469] iio: adc: rockchip_saradc: Use dev_err_probe
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
drivers/iio/adc/rockchip_saradc.c | 45 ++++++++++++++-----------------
|
||
|
|
1 file changed, 20 insertions(+), 25 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
|
||
|
|
index 7883394fdbca..4b011f7eddec 100644
|
||
|
|
--- a/drivers/iio/adc/rockchip_saradc.c
|
||
|
|
+++ b/drivers/iio/adc/rockchip_saradc.c
|
||
|
|
@@ -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)
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|