diff options
| author | Luca Ceresoli <[email protected]> | 2025-05-22 07:12:58 +0000 |
|---|---|---|
| committer | Luca Ceresoli <[email protected]> | 2025-05-22 09:58:18 +0000 |
| commit | ee1855582e5e0f8d73428875b91a30785bcc4b7c (patch) | |
| tree | b624ec27ffbf75f846e68c903dca708548293212 | |
| parent | drm/panel-edp: Add KDC KD116N3730A05 (diff) | |
| download | kernel-ee1855582e5e0f8d73428875b91a30785bcc4b7c.tar.gz kernel-ee1855582e5e0f8d73428875b91a30785bcc4b7c.zip | |
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 <[email protected]>
Closes: https://oftc.catirclogs.org/dri-devel/2025-05-21#34288266;
Tested-by: Chaitanya Kumar Borah <[email protected]>
Reviewed-by: Chaitanya Kumar Borah <[email protected]>
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 <[email protected]>
| -rw-r--r-- | include/drm/drm_bridge.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 464da28f9134..0af5db244db8 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, |