Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Krzysztof Kozlowski
and committed by
Jonathan Cameron
f8831384
0dce3f98
+7
-13
+7
-13
drivers/iio/adc/qcom-spmi-rradc.c
+7
-13
drivers/iio/adc/qcom-spmi-rradc.c
···
934
934
935
935
chip = iio_priv(indio_dev);
936
936
chip->regmap = dev_get_regmap(pdev->dev.parent, NULL);
937
-
if (!chip->regmap) {
938
-
dev_err(dev, "Couldn't get parent's regmap\n");
939
-
return -EINVAL;
940
-
}
937
+
if (!chip->regmap)
938
+
return dev_err_probe(dev, -EINVAL, "Couldn't get parent's regmap\n");
941
939
942
940
chip->dev = dev;
943
941
mutex_init(&chip->conversion_lock);
944
942
945
943
ret = device_property_read_u32(dev, "reg", &chip->base);
946
-
if (ret < 0) {
947
-
dev_err(chip->dev, "Couldn't find reg address, ret = %d\n",
948
-
ret);
949
-
return ret;
950
-
}
944
+
if (ret < 0)
945
+
return dev_err_probe(dev, ret, "Couldn't find reg address\n");
951
946
952
947
batt_id_delay = -1;
953
948
ret = device_property_read_u32(dev, "qcom,batt-id-delay-ms",
···
970
975
971
976
/* Get the PMIC revision, we need it to handle some varying coefficients */
972
977
chip->pmic = qcom_pmic_get(chip->dev);
973
-
if (IS_ERR(chip->pmic)) {
974
-
dev_err(chip->dev, "Unable to get reference to PMIC device\n");
975
-
return PTR_ERR(chip->pmic);
976
-
}
978
+
if (IS_ERR(chip->pmic))
979
+
return dev_err_probe(dev, PTR_ERR(chip->pmic),
980
+
"Unable to get reference to PMIC device\n");
977
981
978
982
switch (chip->pmic->subtype) {
979
983
case PMI8998_SUBTYPE: