OSDN Git Service

drm: bridge: dw-hdmi: fix building without CONFIG_OF
authorArnd Bergmann <arnd@arndb.de>
Mon, 23 Jan 2017 12:20:38 +0000 (13:20 +0100)
committerArchit Taneja <architt@codeaurora.org>
Tue, 24 Jan 2017 05:53:24 +0000 (11:23 +0530)
The of_node member in struct drm_bridge is hidden when CONFIG_OF
is disabled, causing a build error:

drivers/gpu/drm/bridge/dw-hdmi.c: In function '__dw_hdmi_probe':
drivers/gpu/drm/bridge/dw-hdmi.c:2063:14: error: 'struct drm_bridge' has no member named 'of_node'

We could fix this either using a Kconfig dependency on CONFIG_OF
or making the one line conditional. The latter gives us better
compile test coverage, so this is what I'm doing here.

Fixes: 69497eb9234e ("drm: bridge: dw-hdmi: Implement DRM bridge registration")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170123122312.3290934-1-arnd@arndb.de
drivers/gpu/drm/bridge/dw-hdmi.c

index 4fda071..9a9ec27 100644 (file)
@@ -2060,7 +2060,9 @@ __dw_hdmi_probe(struct platform_device *pdev,
 
        hdmi->bridge.driver_private = hdmi;
        hdmi->bridge.funcs = &dw_hdmi_bridge_funcs;
+#ifdef CONFIG_OF
        hdmi->bridge.of_node = pdev->dev.of_node;
+#endif
 
        ret = dw_hdmi_fb_registered(hdmi);
        if (ret)