From: Krzysztof Kozlowski Date: Fri, 19 Dec 2025 14:31:53 +0000 (+0100) Subject: iio: adc: rockchip: Simplify with dev_err_probe X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df2a034aef258ec39524e8fd14440c1b8ce622ff;p=thirdparty%2Fkernel%2Flinux.git iio: adc: rockchip: Simplify with dev_err_probe Use dev_err_probe() to make error code handling simpler and handle deferred probe nicely (avoid spamming logs). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Shawn Lin Signed-off-by: Jonathan Cameron --- diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c index 6721da0ed7bb..263d80c5fc50 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -492,10 +492,9 @@ static int rockchip_saradc_probe(struct platform_device *pdev) */ info->reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "saradc-apb"); - if (IS_ERR(info->reset)) { - ret = PTR_ERR(info->reset); - return dev_err_probe(&pdev->dev, ret, "failed to get saradc-apb\n"); - } + if (IS_ERR(info->reset)) + return dev_err_probe(&pdev->dev, PTR_ERR(info->reset), + "failed to get saradc-apb\n"); init_completion(&info->completion); @@ -505,10 +504,8 @@ static int rockchip_saradc_probe(struct platform_device *pdev) ret = devm_request_irq(&pdev->dev, irq, rockchip_saradc_isr, 0, dev_name(&pdev->dev), info); - if (ret < 0) { - dev_err(&pdev->dev, "failed requesting irq %d\n", irq); - return ret; - } + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, "failed requesting irq %d\n", irq); info->vref = devm_regulator_get(&pdev->dev, "vref"); if (IS_ERR(info->vref))