Skip to contentSkip to conversation

vc4: fix build failure in vc4_dsi_dev_probe()

PATCH Applied Arnd Bergmann 2 participants 2 messages Jan 17, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vc4: fix build failure in vc4_dsi_dev_probe()

From: Arnd Bergmann <[email protected]>

The bridge->of_node field is defined inside of an #ifdef, which results in a build failure when compile-testing the vc4_dsi driver without CONFIG_OF:

drivers/gpu/drm/vc4/vc4_dsi.c: In function 'vc4_dsi_dev_probe':
drivers/gpu/drm/vc4/vc4_dsi.c:1822:20: error: 'struct drm_bridge' has no member named 'of_node'
1822 | dsi->bridge.of_node = dev->of_node;

Add another #ifdef in the place it is used in. Alternatively we could consider dropping the #ifdef in the struct definition and all other users.

Fixes 78df640394cd ("drm/vc4: dsi: Convert to using a bridge instead of encoder")
---
 drivers/gpu/drm/vc4/vc4_dsi.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/vc4/vc4_dsi.c +2 -0
index 2a71321b9222..a5c075f802e4 100644
@@ -1819,7 +1819,9 @@ static int vc4_dsi_dev_probe(struct platform_device *pdev)
 
 	dsi->pdev = pdev;
 	dsi->bridge.funcs = &vc4_dsi_bridge_funcs;
+#ifdef CONFIG_OF
 	dsi->bridge.of_node = dev->of_node;
+#endif
 	dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
 	dsi->dsi_host.ops = &vc4_dsi_host_ops;
 	dsi->dsi_host.dev = dev;
Signature · 1 line
2.39.0
#1 lore raw

Re: (subset) [PATCH] vc4: fix build failure in vc4_dsi_dev_probe()

Quoted 9 lines · Arnd Bergmann

The bridge->of_node field is defined inside of an #ifdef, which results in a build failure when compile-testing the vc4_dsi driver without CONFIG_OF:

drivers/gpu/drm/vc4/vc4_dsi.c: In function 'vc4_dsi_dev_probe':
drivers/gpu/drm/vc4/vc4_dsi.c:1822:20: error: 'struct drm_bridge' has no member named 'of_node'
1822 | dsi->bridge.of_node = dev->of_node;

[...]

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime