提交 e7a3c8b9 编写于 作者: K Krzysztof Kozlowski 提交者: Greg Kroah-Hartman

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: NKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220916122910.170730-4-srinivas.kandagatla@linaro.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 16f14551
...@@ -1543,10 +1543,8 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) ...@@ -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, ret = devm_request_irq(dev, ret, qcom_slim_ngd_interrupt,
IRQF_TRIGGER_HIGH, "slim-ngd", ctrl); IRQF_TRIGGER_HIGH, "slim-ngd", ctrl);
if (ret) { if (ret)
dev_err(&pdev->dev, "request IRQ failed\n"); return dev_err_probe(&pdev->dev, ret, "request IRQ failed\n");
return ret;
}
ctrl->nb.notifier_call = qcom_slim_ngd_ssr_notify; ctrl->nb.notifier_call = qcom_slim_ngd_ssr_notify;
ctrl->notifier = qcom_register_ssr_notifier("lpass", &ctrl->nb); ctrl->notifier = qcom_register_ssr_notifier("lpass", &ctrl->nb);
...@@ -1575,15 +1573,14 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) ...@@ -1575,15 +1573,14 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)
ctrl->pdr = pdr_handle_alloc(slim_pd_status, ctrl); ctrl->pdr = pdr_handle_alloc(slim_pd_status, ctrl);
if (IS_ERR(ctrl->pdr)) { if (IS_ERR(ctrl->pdr)) {
dev_err(dev, "Failed to init PDR handle\n"); ret = dev_err_probe(dev, PTR_ERR(ctrl->pdr),
ret = PTR_ERR(ctrl->pdr); "Failed to init PDR handle\n");
goto err_pdr_alloc; goto err_pdr_alloc;
} }
pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd"); pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd");
if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) { if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) {
ret = PTR_ERR(pds); ret = dev_err_probe(dev, PTR_ERR(pds), "pdr add lookup failed\n");
dev_err(dev, "pdr add lookup failed: %d\n", ret);
goto err_pdr_lookup; goto err_pdr_lookup;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册