iio: adc: qcom-spmi-rradc: Simplify with dev_err_probe

Use dev_err_probe() to make error code handling simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/qcom-spmi-rradc.c b/drivers/iio/adc/qcom-spmi-rradc.c
index b245416bae12121e16033f0185d8d0d2ef28f7ee..8e75665204d1d8beb38314dea8a130a4f7b6e619 100644 (file)
--- a/drivers/iio/adc/qcom-spmi-rradc.c
+++ b/drivers/iio/adc/qcom-spmi-rradc.c
@@ -934,20 +934,15 @@ static int rradc_probe(struct platform_device *pdev)
 
        chip = iio_priv(indio_dev);
        chip->regmap = dev_get_regmap(pdev->dev.parent, NULL);
-       if (!chip->regmap) {
-               dev_err(dev, "Couldn't get parent's regmap\n");
-               return -EINVAL;
-       }
+       if (!chip->regmap)
+               return dev_err_probe(dev, -EINVAL, "Couldn't get parent's regmap\n");
 
        chip->dev = dev;
        mutex_init(&chip->conversion_lock);
 
        ret = device_property_read_u32(dev, "reg", &chip->base);
-       if (ret < 0) {
-               dev_err(chip->dev, "Couldn't find reg address, ret = %d\n",
-                       ret);
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "Couldn't find reg address\n");
 
        batt_id_delay = -1;
        ret = device_property_read_u32(dev, "qcom,batt-id-delay-ms",
@@ -975,10 +970,9 @@ static int rradc_probe(struct platform_device *pdev)
 
        /* Get the PMIC revision, we need it to handle some varying coefficients */
        chip->pmic = qcom_pmic_get(chip->dev);
-       if (IS_ERR(chip->pmic)) {
-               dev_err(chip->dev, "Unable to get reference to PMIC device\n");
-               return PTR_ERR(chip->pmic);
-       }
+       if (IS_ERR(chip->pmic))
+               return dev_err_probe(dev, PTR_ERR(chip->pmic),
+                                    "Unable to get reference to PMIC device\n");
 
        switch (chip->pmic->subtype) {
        case PMI8998_SUBTYPE: