mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-25 23:02:51 -04:00
drm/imx/dw-hdmi: convert to of_drm_find_and_get_bridge()
of_drm_find_bridge() is deprecated. Move to its replacement of_drm_find_and_get_bridge() which gets a bridge reference, and ensure it is put when done. Acked-by: Maxime Ripard <mripard@kernel.org> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Link: https://patch.msgid.link/20260109-drm-bridge-alloc-getput-drm_of_find_bridge-3-v2-3-8d7a3dbacdf4@bootlin.com Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
This commit is contained in:
@@ -241,7 +241,7 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(hdmi->hdmi))
|
||||
return PTR_ERR(hdmi->hdmi);
|
||||
|
||||
hdmi->bridge = of_drm_find_bridge(np);
|
||||
hdmi->bridge = of_drm_find_and_get_bridge(np);
|
||||
if (!hdmi->bridge) {
|
||||
dev_err(hdmi->dev, "Unable to find bridge\n");
|
||||
dw_hdmi_remove(hdmi->hdmi);
|
||||
@@ -249,8 +249,10 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
ret = component_add(&pdev->dev, &dw_hdmi_imx_ops);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
drm_bridge_put(hdmi->bridge);
|
||||
dw_hdmi_remove(hdmi->hdmi);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -260,6 +262,7 @@ static void dw_hdmi_imx_remove(struct platform_device *pdev)
|
||||
struct imx_hdmi *hdmi = platform_get_drvdata(pdev);
|
||||
|
||||
component_del(&pdev->dev, &dw_hdmi_imx_ops);
|
||||
drm_bridge_put(hdmi->bridge);
|
||||
dw_hdmi_remove(hdmi->hdmi);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user