Commit e7a3c8b9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220916122910.170730-4-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16f14551

drivers/slimbus/qcom-ngd-ctrl.c

+5 −8
Original line number Diff line number Diff line
@@ -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;

	}