| Message ID | 20170123122312.3290934-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/23/2017 05:50 PM, Arnd Bergmann wrote: > 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> Thanks for fixing this, queued to drm-misc. Archit > --- > drivers/gpu/drm/bridge/dw-hdmi.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c > index 4fda0717e789..9a9ec27d9e28 100644 > --- a/drivers/gpu/drm/bridge/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/dw-hdmi.c > @@ -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) >
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 4fda0717e789..9a9ec27d9e28 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -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)
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> --- drivers/gpu/drm/bridge/dw-hdmi.c | 2 ++ 1 file changed, 2 insertions(+)