Message ID | 20220221073757.12181-1-jose.exposito89@gmail.com (mailing list archive) |
---|---|
State | New |
Delegated to: | Kieran Bingham |
Headers | show |
Series | drm: rcar-du: switch to devm_drm_of_get_bridge | expand |
On Mon, Feb 21, 2022 at 08:37:57AM +0100, José Expósito wrote: > 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. > > Signed-off-by: José Expósito <jose.exposito89@gmail.com> > --- > drivers/gpu/drm/rcar-du/rcar_lvds.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c > index 72a272cfc11e..99b0febc56d1 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c > +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c > @@ -712,18 +712,12 @@ static int rcar_lvds_parse_dt(struct rcar_lvds *lvds) > { > int ret; > > - ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0, > - &lvds->panel, &lvds->next_bridge); I guess lvds->panel can be removed from the rcar_lvds struct as well? Maxime
On Mon, Feb 21, 2022 at 09:56:19AM +0100, Maxime Ripard wrote: > On Mon, Feb 21, 2022 at 08:37:57AM +0100, José Expósito wrote: > > 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. > > > > Signed-off-by: José Expósito <jose.exposito89@gmail.com> > > --- > > drivers/gpu/drm/rcar-du/rcar_lvds.c | 16 +++++----------- > > 1 file changed, 5 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c > > index 72a272cfc11e..99b0febc56d1 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c > > +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c > > @@ -712,18 +712,12 @@ static int rcar_lvds_parse_dt(struct rcar_lvds *lvds) > > { > > int ret; > > > > - ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0, > > - &lvds->panel, &lvds->next_bridge); > > I guess lvds->panel can be removed from the rcar_lvds struct as well? It's used in rcar_lvds_get_lvds_mode() though, so this patch introduces a regression.
On Mon, Feb 21, 2022 at 02:15:01PM +0200, Laurent Pinchart wrote: > On Mon, Feb 21, 2022 at 09:56:19AM +0100, Maxime Ripard wrote: > > I guess lvds->panel can be removed from the rcar_lvds struct as well? > > It's used in rcar_lvds_get_lvds_mode() though, so this patch introduces > a regression. True, my bad. Sorry about that.
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index 72a272cfc11e..99b0febc56d1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c @@ -712,18 +712,12 @@ static int rcar_lvds_parse_dt(struct rcar_lvds *lvds) { int ret; - ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0, - &lvds->panel, &lvds->next_bridge); - if (ret) + lvds->next_bridge = devm_drm_of_get_bridge(lvds->dev, + lvds->dev->of_node, + 1, 0); + if (IS_ERR(lvds->next_bridge)) { + ret = -EINVAL; goto done; - - if (lvds->panel) { - lvds->next_bridge = devm_drm_panel_bridge_add(lvds->dev, - lvds->panel); - if (IS_ERR_OR_NULL(lvds->next_bridge)) { - ret = -EINVAL; - goto done; - } } if (lvds->info->quirks & RCAR_LVDS_QUIRK_DUAL_LINK)
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. Signed-off-by: José Expósito <jose.exposito89@gmail.com> --- drivers/gpu/drm/rcar-du/rcar_lvds.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)