The function "drm_of_find_panel_or_bridge" has been deprecated in favor of "devm_drm_of_get_bridge". Switch to the new function and reduce boilerplate. Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx> Reviewed-by: Liu Ying <victor.liu@xxxxxxx> Reported-by: Liu Ying <victor.liu@xxxxxxxxxxx> Tested-by: Martyn Welch <martyn.welch@xxxxxxxxxxxxx> Fixes: 9db35bb349a0e ("drm: lcdif: Add support for i.MX8MP LCDIF variant") Signed-off-by: Marek Vasut <marex@xxxxxxx> Cc: Alexander Stein <alexander.stein@xxxxxxxxxxxxxxx> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> Cc: Liu Ying <victor.liu@xxxxxxx> Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx> Cc: Marek Vasut <marex@xxxxxxx> Cc: Martyn Welch <martyn.welch@xxxxxxxxxxxxx> Cc: Peng Fan <peng.fan@xxxxxxx> Cc: Robby Cai <robby.cai@xxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Cc: Stefan Agner <stefan@xxxxxxxx> --- V2: Add RB from Liu V3: Add TB from Martyn from V1 V4: Add AB from Sam from V2 --- drivers/gpu/drm/mxsfb/lcdif_drv.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c b/drivers/gpu/drm/mxsfb/lcdif_drv.c index 1370889c6d687..746a4261f3da2 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.c +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c @@ -42,23 +42,11 @@ static int lcdif_attach_bridge(struct lcdif_drm_private *lcdif) { struct drm_device *drm = lcdif->drm; struct drm_bridge *bridge; - struct drm_panel *panel; int ret; - ret = drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0, &panel, - &bridge); - if (ret) - return ret; - - if (panel) { - bridge = devm_drm_panel_bridge_add_typed(drm->dev, panel, - DRM_MODE_CONNECTOR_DPI); - if (IS_ERR(bridge)) - return PTR_ERR(bridge); - } - - if (!bridge) - return -ENODEV; + bridge = devm_drm_of_get_bridge(drm->dev, drm->dev->of_node, 0, 0); + if (IS_ERR(bridge)) + return PTR_ERR(bridge); ret = drm_bridge_attach(&lcdif->encoder, bridge, NULL, 0); if (ret) -- 2.35.1