Commit 03c7aea3 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Chun-Kuang Hu
Browse files

drm/mediatek: mtk_hdmi: Use dev_err_probe() in mtk_hdmi_dt_parse_pdata() 



Change error prints to use dev_err_probe() instead of dev_err()
where possible in function mtk_hdmi_dt_parse_pdata(), used only
during device probe.
While at it, also beautify some prints.

Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20250415104321.51149-13-angelogioacchino.delregno@collabora.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 78377020

drivers/gpu/drm/mediatek/mtk_hdmi.c

+7 −17
Original line number Diff line number Diff line
@@ -1368,19 +1368,13 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, 
	int ret;



	ret = mtk_hdmi_get_all_clk(hdmi, np);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to get clocks: %d\n", ret);



		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to get clocks\n");



	/* The CEC module handles HDMI hotplug detection */

	cec_np = of_get_compatible_child(np->parent, "mediatek,mt8173-cec");

	if (!cec_np) {

		dev_err(dev, "Failed to find CEC node\n");

		return -EINVAL;

	}

	if (!cec_np)

		return dev_err_probe(dev, -EINVAL, "Failed to find CEC node\n");



	cec_pdev = of_find_device_by_node(cec_np);

	if (!cec_pdev) {
@@ -1429,20 +1423,16 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, 
	}



	i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0);

	if (!i2c_np) {

		dev_err(dev, "Failed to find ddc-i2c-bus node in %pOF\n",

			remote);

	of_node_put(remote);

		ret = -EINVAL;

	if (!i2c_np) {

		ret = dev_err_probe(dev, -EINVAL, "No ddc-i2c-bus in connector\n");

		goto put_device;

	}

	of_node_put(remote);



	hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);

	of_node_put(i2c_np);

	if (!hdmi->ddc_adpt) {

		dev_err(dev, "Failed to get ddc i2c adapter by node\n");

		ret = -EINVAL;

		ret = dev_err_probe(dev, -EINVAL, "Failed to get ddc i2c adapter by node\n");

		goto put_device;

	}