Re: [PATCH v6 3/4] drm/bridge: Drop CONFIG_OF conditionals around of_node pointers
Hi, On Thu, Aug 31, 2023 at 1:10 AM Biju Das wrote: > > Having conditional around the of_node pointers turns out to make driver > code use ugly #ifdef and #if blocks. So drop the conditionals. > > Suggested-by: Douglas Anderson > Signed-off-by: Biju Das > Reviewed-by: Douglas Anderson > --- > v5->v6: > * Added Rb tag from Douglas Anderson. > * Dropped conditionals from remaining drm/bridge drivers. > v5: > * Split from patch#2 > --- > drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 -- > drivers/gpu/drm/bridge/panel.c | 2 -- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 -- > drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 -- > 4 files changed, 8 deletions(-) I think this has had enough time to marinate, so landed to drm-misc-next: 481fc9e7e11d drm/bridge: Drop CONFIG_OF conditionals around of_node pointers
Re: [PATCH v6 3/4] drm/bridge: Drop CONFIG_OF conditionals around of_node pointers
On Thu, Aug 31, 2023 at 09:09:37AM +0100, Biju Das wrote: > Having conditional around the of_node pointers turns out to make driver > code use ugly #ifdef and #if blocks. So drop the conditionals. ... > anx78xx->bridge.of_node = client->dev.of_node; > panel_bridge->bridge.of_node = panel->dev->of_node; > hdmi->bridge.of_node = pdev->dev.of_node; > dsi->bridge.of_node = pdev->dev.of_node; Yeah, I would really switch all of these to bridge->fwnode = dev_fwnode(...); But it's a suggestion for a separate change that I think can happen sooner than later. -- With Best Regards, Andy Shevchenko
Re: [PATCH v6 3/4] drm/bridge: Drop CONFIG_OF conditionals around of_node pointers
Hi Biju, Thank you for the patch. On Thu, Aug 31, 2023 at 09:09:37AM +0100, Biju Das wrote: > Having conditional around the of_node pointers turns out to make driver > code use ugly #ifdef and #if blocks. So drop the conditionals. > > Suggested-by: Douglas Anderson > Signed-off-by: Biju Das > Reviewed-by: Douglas Anderson Reviewed-by: Laurent Pinchart > --- > v5->v6: > * Added Rb tag from Douglas Anderson. > * Dropped conditionals from remaining drm/bridge drivers. > v5: > * Split from patch#2 > --- > drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 -- > drivers/gpu/drm/bridge/panel.c | 2 -- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 -- > drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 -- > 4 files changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c > b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c > index 6169db73d2fe..ad8241758896 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c > @@ -1231,9 +1231,7 @@ static int anx78xx_i2c_probe(struct i2c_client *client) > > mutex_init(&anx78xx->lock); > > -#if IS_ENABLED(CONFIG_OF) > anx78xx->bridge.of_node = client->dev.of_node; > -#endif > > anx78xx->client = client; > i2c_set_clientdata(client, anx78xx); > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c > index 9316384b4474..7f41525f7a6e 100644 > --- a/drivers/gpu/drm/bridge/panel.c > +++ b/drivers/gpu/drm/bridge/panel.c > @@ -302,9 +302,7 @@ struct drm_bridge *drm_panel_bridge_add_typed(struct > drm_panel *panel, > panel_bridge->panel = panel; > > panel_bridge->bridge.funcs = &panel_bridge_bridge_funcs; > -#ifdef CONFIG_OF > panel_bridge->bridge.of_node = panel->dev->of_node; > -#endif > panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES; > panel_bridge->bridge.type = connector_type; > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 6c1d79474505..52d91a0df85e 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -3541,9 +3541,7 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device > *pdev, >| DRM_BRIDGE_OP_HPD; > hdmi->bridge.interlace_allowed = true; > hdmi->bridge.ddc = hdmi->ddc; > -#ifdef CONFIG_OF > hdmi->bridge.of_node = pdev->dev.of_node; > -#endif > > memset(&pdevinfo, 0, sizeof(pdevinfo)); > pdevinfo.parent = dev; > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > index 04d4a1a10698..a8dd2a2e7c7b 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > @@ -1182,9 +1182,7 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, > > dsi->bridge.driver_private = dsi; > dsi->bridge.funcs = &dw_mipi_dsi_bridge_funcs; > -#ifdef CONFIG_OF > dsi->bridge.of_node = pdev->dev.of_node; > -#endif > > return dsi; > } -- Regards, Laurent Pinchart
[PATCH v6 3/4] drm/bridge: Drop CONFIG_OF conditionals around of_node pointers
Having conditional around the of_node pointers turns out to make driver code use ugly #ifdef and #if blocks. So drop the conditionals. Suggested-by: Douglas Anderson Signed-off-by: Biju Das Reviewed-by: Douglas Anderson --- v5->v6: * Added Rb tag from Douglas Anderson. * Dropped conditionals from remaining drm/bridge drivers. v5: * Split from patch#2 --- drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 -- drivers/gpu/drm/bridge/panel.c | 2 -- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 -- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c index 6169db73d2fe..ad8241758896 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -1231,9 +1231,7 @@ static int anx78xx_i2c_probe(struct i2c_client *client) mutex_init(&anx78xx->lock); -#if IS_ENABLED(CONFIG_OF) anx78xx->bridge.of_node = client->dev.of_node; -#endif anx78xx->client = client; i2c_set_clientdata(client, anx78xx); diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 9316384b4474..7f41525f7a6e 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -302,9 +302,7 @@ struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel, panel_bridge->panel = panel; panel_bridge->bridge.funcs = &panel_bridge_bridge_funcs; -#ifdef CONFIG_OF panel_bridge->bridge.of_node = panel->dev->of_node; -#endif panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES; panel_bridge->bridge.type = connector_type; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 6c1d79474505..52d91a0df85e 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -3541,9 +3541,7 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, | DRM_BRIDGE_OP_HPD; hdmi->bridge.interlace_allowed = true; hdmi->bridge.ddc = hdmi->ddc; -#ifdef CONFIG_OF hdmi->bridge.of_node = pdev->dev.of_node; -#endif memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.parent = dev; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c index 04d4a1a10698..a8dd2a2e7c7b 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -1182,9 +1182,7 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, dsi->bridge.driver_private = dsi; dsi->bridge.funcs = &dw_mipi_dsi_bridge_funcs; -#ifdef CONFIG_OF dsi->bridge.of_node = pdev->dev.of_node; -#endif return dsi; } -- 2.25.1
