]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/bridge: fix build with CONFIG_OF=n
authorLuca Ceresoli <luca.ceresoli@bootlin.com>
Thu, 22 May 2025 07:12:58 +0000 (09:12 +0200)
committerLuca Ceresoli <luca.ceresoli@bootlin.com>
Thu, 22 May 2025 09:58:18 +0000 (11:58 +0200)
Commit 5164553d739e ("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: 5164553d739e ("drm/bridge: add devm_drm_put_bridge()")
Reported-by: Ville Syrjala <ville.syrjala@linux.intel.com>
Closes: https://oftc.catirclogs.org/dri-devel/2025-05-21#34288266;
Tested-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Reviewed-by: Chaitanya 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: Luca Ceresoli <luca.ceresoli@bootlin.com>
include/drm/drm_bridge.h

index 464da28f9134f0fcece5c72a8c5fe7f3e42c7e3d..0af5db244db8580ea0c9af1d9a373b7bf62ee699 100644 (file)
@@ -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,