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 <dianders@chromium.org>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230831080938.47454-4-biju.das.jz@bp.renesas.com

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
index 6169db73d2fe8ad0cd84b5143a6a2a9cc1b89c5f..ad824175889618e334993030020d817ce9b8ecb0 100644 (file)
--- 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 a6587d23350528841b2928d668f6c992e97e4a16..e00d2e94c751b85a5b8d760f8ef4f277274c1e2a 100644 (file)
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -318,9 +318,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 6c1d7947450545916befc09ce2fc3127d9654c99..52d91a0df85e9ba3f6082b71b9218dd0f53e8a01 100644 (file)
--- 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 04d4a1a10698103cb88ab41f11f8f75b048ec039..a8dd2a2e7c7b479911a18fda2fb8c841f6cd7143 100644 (file)
--- 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;
 }