[PATCH v5 20/34] drm/mediatek: mtk_hdmi: Use dev_err_probe() in mtk_hdmi_dt_parse_pdata()
CK Hu (胡俊光)
ck.hu at mediatek.com
Fri Jan 24 08:24:54 UTC 2025
Hi, Angelo:
On Mon, 2025-01-13 at 15:52 +0100, AngeloGioacchino Del Regno wrote:
> External email : Please do not click links or open attachments until you have verified the sender or the content.
>
>
> 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.
I think you have do two things.
The first one is "Use dev_err_probe() in mtk_hdmi_dt_parse_pdata()" as the title says.
The second one is "beautify some prints".
The title does not mention the second one, so I think the second one is not related to this patch.
You think some refinement is not worth to be a patch.
If it's not worth, maybe we should keep them as they are.
Or you could collect all refinement into one refinement patch, and this would looks worth.
Regards,
CK
>
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
> ---
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 34 ++++++++++-------------------
> 1 file changed, 11 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 65e9629b6b77..48c37294dcbb 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1372,30 +1372,23 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
> {
> struct device *dev = &pdev->dev;
> struct device_node *np = dev->of_node;
> - struct device_node *cec_np, *remote, *i2c_np;
> + struct device_node *remote, *i2c_np;
> struct platform_device *cec_pdev;
> struct regmap *regmap;
> 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) {
> - dev_err(hdmi->dev, "Waiting for CEC device %pOF\n",
> - cec_np);
> + dev_err(hdmi->dev, "Waiting for CEC device %pOF\n", cec_np);
> of_node_put(cec_np);
> return -EPROBE_DEFER;
> }
> @@ -1413,9 +1406,8 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
> if (IS_ERR(regmap))
> ret = PTR_ERR(regmap);
> if (ret) {
> - dev_err(dev,
> - "Failed to get system configuration registers: %d\n",
> - ret);
> + dev_err_probe(dev, ret,
> + "Failed to get system configuration registers\n");
> goto put_device;
> }
> hdmi->sys_regmap = regmap;
> @@ -1443,20 +1435,16 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
> }
>
> i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0);
> + of_node_put(remote);
> if (!i2c_np) {
> - dev_err(dev, "Failed to find ddc-i2c-bus node in %pOF\n",
> - remote);
> - of_node_put(remote);
> - ret = -EINVAL;
> + 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;
> }
>
> --
> 2.47.0
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20250124/30cfb5f1/attachment-0001.htm>
More information about the dri-devel
mailing list