From: Luca Ceresoli Date: Thu, 22 May 2025 07:12:58 +0000 (+0200) Subject: drm/bridge: fix build with CONFIG_OF=n X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee1855582e5e0f8d73428875b91a30785bcc4b7c;p=thirdparty%2Flinux.git drm/bridge: fix build with CONFIG_OF=n 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 Closes: https://oftc.catirclogs.org/dri-devel/2025-05-21#34288266; Tested-by: Chaitanya Kumar Borah Reviewed-by: Chaitanya Kumar Borah 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 --- diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 464da28f9134f..0af5db244db85 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -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,