slimbus: qcom-ngd: simplify error paths with dev_err_probe

Use dev_err_probe to skip printing of deferred probe errors and to
simplify error paths.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220916122910.170730-4-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index bacc6af1d51e2289f21d8d14e6c4b756cf488002..cec11aa106bf1114ec5199b8278238548aff053b 100644 (file)
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1543,10 +1543,8 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)
 
        ret = devm_request_irq(dev, ret, qcom_slim_ngd_interrupt,
                               IRQF_TRIGGER_HIGH, "slim-ngd", ctrl);
-       if (ret) {
-               dev_err(&pdev->dev, "request IRQ failed\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "request IRQ failed\n");
 
        ctrl->nb.notifier_call = qcom_slim_ngd_ssr_notify;
        ctrl->notifier = qcom_register_ssr_notifier("lpass", &ctrl->nb);
@@ -1575,15 +1573,14 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)
 
        ctrl->pdr = pdr_handle_alloc(slim_pd_status, ctrl);
        if (IS_ERR(ctrl->pdr)) {
-               dev_err(dev, "Failed to init PDR handle\n");
-               ret = PTR_ERR(ctrl->pdr);
+               ret = dev_err_probe(dev, PTR_ERR(ctrl->pdr),
+                                   "Failed to init PDR handle\n");
                goto err_pdr_alloc;
        }
 
        pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd");
        if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) {
-               ret = PTR_ERR(pds);
-               dev_err(dev, "pdr add lookup failed: %d\n", ret);
+               ret = dev_err_probe(dev, PTR_ERR(pds), "pdr add lookup failed\n");
                goto err_pdr_lookup;
        }