admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/mediatek: mtk_hdmi: Move CEC device parsing in new function

Browse Source 
Move the CEC device parsing logic to a new function called
mtk_hdmi_get_cec_dev(), and move the parsing action to the end
of mtk_hdmi_dt_parse_pdata(), allowing to remove gotos in this
function, reducing code size and improving readability.

Reviewed-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20250415104321.51149-14-angelogioacchino.delregno@collabora.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
This commit is contained in:
AngeloGioacchino Del Regno
2025-04-15 12:43:11 +02:00
committed by Chun-Kuang Hu
parent 03c7aea33c
commit 7485be967f
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
drivers/gpu/drm/mediatek/mtk_hdmi.c
View File

@@ -1357,14 +1357,10 @@ static const struct drm_bridge_funcs mtk_hdmi_bridge_funcs = {
.edid_read = mtk_hdmi_bridge_edid_read, .edid_read = mtk_hdmi_bridge_edid_read,
}; };
static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, static int mtk_hdmi_get_cec_dev(struct mtk_hdmi *hdmi, struct device *dev, struct device_node *np)
struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct device_node *cec_np, *remote, *i2c_np;
struct platform_device *cec_pdev; struct platform_device *cec_pdev;
struct regmap *regmap; struct device_node *cec_np;
int ret; int ret;
ret = mtk_hdmi_get_all_clk(hdmi, np); ret = mtk_hdmi_get_all_clk(hdmi, np);
@@ -1384,62 +1380,66 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
of_node_put(cec_np); of_node_put(cec_np);
hdmi->cec_dev = &cec_pdev->dev;
/* /*
* The mediatek,syscon-hdmi property contains a phandle link to the * The mediatek,syscon-hdmi property contains a phandle link to the
* MMSYS_CONFIG device and the register offset of the HDMI_SYS_CFG * MMSYS_CONFIG device and the register offset of the HDMI_SYS_CFG
* registers it contains. * registers it contains.
*/ */
regmap = syscon_regmap_lookup_by_phandle_args(np, "mediatek,syscon-hdmi", hdmi->sys_regmap = syscon_regmap_lookup_by_phandle_args(np, "mediatek,syscon-hdmi",
1, &hdmi->sys_offset); 1, &hdmi->sys_offset);
if (IS_ERR(regmap)) { if (IS_ERR(hdmi->sys_regmap))
ret = dev_err_probe(dev, PTR_ERR(regmap), return dev_err_probe(dev, PTR_ERR(hdmi->sys_regmap),
"Failed to get system configuration registers\n"); "Failed to get system configuration registers\n");
goto put_device;
} hdmi->cec_dev = &cec_pdev->dev;
hdmi->sys_regmap = regmap; return 0;
}
static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct device_node *remote, *i2c_np;
int ret;
ret = mtk_hdmi_get_all_clk(hdmi, np);
if (ret)
return dev_err_probe(dev, ret, "Failed to get clocks\n");
hdmi->regs = device_node_to_regmap(dev->of_node); hdmi->regs = device_node_to_regmap(dev->of_node);
if (IS_ERR(hdmi->regs)) { if (IS_ERR(hdmi->regs))
ret = PTR_ERR(hdmi->regs); return PTR_ERR(hdmi->regs);
goto put_device;
}
remote = of_graph_get_remote_node(np, 1, 0); remote = of_graph_get_remote_node(np, 1, 0);
if (!remote) { if (!remote)
ret = -EINVAL; return -EINVAL;
goto put_device;
}
if (!of_device_is_compatible(remote, "hdmi-connector")) { if (!of_device_is_compatible(remote, "hdmi-connector")) {
hdmi->next_bridge = of_drm_find_bridge(remote); hdmi->next_bridge = of_drm_find_bridge(remote);
if (!hdmi->next_bridge) { if (!hdmi->next_bridge) {
dev_err(dev, "Waiting for external bridge\n"); dev_err(dev, "Waiting for external bridge\n");
of_node_put(remote); of_node_put(remote);
ret = -EPROBE_DEFER; return -EPROBE_DEFER;
goto put_device;
} }
} }
i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0); i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0);
of_node_put(remote); of_node_put(remote);
if (!i2c_np) { if (!i2c_np)
ret = dev_err_probe(dev, -EINVAL, "No ddc-i2c-bus in connector\n"); return dev_err_probe(dev, -EINVAL, "No ddc-i2c-bus in connector\n");
goto put_device;
}
hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np); hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);
of_node_put(i2c_np); of_node_put(i2c_np);
if (!hdmi->ddc_adpt) { if (!hdmi->ddc_adpt)
ret = dev_err_probe(dev, -EINVAL, "Failed to get ddc i2c adapter by node\n"); return dev_err_probe(dev, -EINVAL, "Failed to get ddc i2c adapter by node\n");
goto put_device;
} ret = mtk_hdmi_get_cec_dev(hdmi, dev, np);
if (ret)
return ret;
return 0; return 0;
put_device:
put_device(hdmi->cec_dev);
return ret;
} }
/* /*