Commit ee185558 authored by Luca Ceresoli's avatar Luca Ceresoli
Browse files

drm/bridge: fix build with CONFIG_OF=n 



Commit 5164553d ("drm/bridge: add devm_drm_put_bridge()") adds two
declarations for devm_drm_put_bridge():

 1) an inline declaration in the #else branch of
    '#if defined(CONFIG_OF)...'
 2) one outside of the same #if

This results in a build failure with CONFIG_OF=n:

  ../drivers/gpu/drm/drm_bridge.c:1406:6: error: redefinition of ‘devm_drm_put_bridge’

The function has nothing to do with OF, thus fix by removing declaration 1.

Fixes: 5164553d ("drm/bridge: add devm_drm_put_bridge()")
Reported-by: default avatarVille Syrjala <ville.syrjala@linux.intel.com>
Closes: https://oftc.catirclogs.org/dri-devel/2025-05-21#34288266;


Tested-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Reviewed-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/20250522-devm_drm_put_bridge-fix-non-of-build-v1-1-a05234dea046@bootlin.com


Signed-off-by: default avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
parent a3436f63

include/drm/drm_bridge.h

+0 −2
Original line number Diff line number Diff line
@@ -1311,8 +1311,6 @@ static inline struct drm_bridge *devm_drm_of_get_bridge(struct device *dev, 
	return ERR_PTR(-ENODEV);

}



static inline void devm_drm_put_bridge(struct device *dev, struct drm_bridge *bridge) {}



static inline struct drm_bridge *drmm_of_get_bridge(struct drm_device *drm,

						     struct device_node *node,

						     u32 port,