Skip to content

Commit

Permalink
drm/vc4: dpi: Switch to devm_drm_of_get_bridge
Browse files Browse the repository at this point in the history
The new devm_drm_of_get_bridge removes most of the boilerplate we
have to deal with. Let's switch to it.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210910130941.1740182-3-maxime@cerno.tech
  • Loading branch information
Maxime Ripard committed Sep 14, 2021
1 parent 87ea958 commit 0caddbb
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions drivers/gpu/drm/vc4/vc4_dpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,26 +229,19 @@ static const struct of_device_id vc4_dpi_dt_match[] = {
static int vc4_dpi_init_bridge(struct vc4_dpi *dpi)
{
struct device *dev = &dpi->pdev->dev;
struct drm_panel *panel;
struct drm_bridge *bridge;
int ret;

ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
&panel, &bridge);
if (ret) {
bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
if (IS_ERR(bridge)) {
/* If nothing was connected in the DT, that's not an
* error.
*/
if (ret == -ENODEV)
if (PTR_ERR(bridge) == -ENODEV)
return 0;
else
return ret;
return PTR_ERR(bridge);
}

if (panel)
bridge = drm_panel_bridge_add_typed(panel,
DRM_MODE_CONNECTOR_DPI);

return drm_bridge_attach(dpi->encoder, bridge, NULL, 0);
}

Expand Down

0 comments on commit 0caddbb

Please sign in to comment.