linux-kernel - RE: [PATCH] drm/bridge: fix build with CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <SJ1PR11MB6129DAE64D41911F049AF98EB999A@SJ1PR11MB6129.namprd11.prod.outlook.com>
Date: Thu, 22 May 2025 07:58:57 +0000
From: "Borah, Chaitanya Kumar" <chaitanya.kumar.borah@...el.com>
To: Luca Ceresoli <luca.ceresoli@...tlin.com>, Maarten Lankhorst
	<maarten.lankhorst@...ux.intel.com>, Maxime Ripard <mripard@...nel.org>,
	Thomas Zimmermann <tzimmermann@...e.de>, "Hajda, Andrzej"
	<andrzej.hajda@...el.com>, Neil Armstrong <neil.armstrong@...aro.org>, Robert
 Foss <rfoss@...nel.org>, Laurent Pinchart
	<Laurent.pinchart@...asonboard.com>, Jonas Karlman <jonas@...boo.se>, "Jernej
 Skrabec" <jernej.skrabec@...il.com>, David Airlie <airlied@...il.com>, Simona
 Vetter <simona@...ll.ch>, Ville Syrjala <ville.syrjala@...ux.intel.com>
CC: Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
	"dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] drm/bridge: fix build with CONFIG_OF=n



> -----Original Message-----
> From: dri-devel <dri-devel-bounces@...ts.freedesktop.org> On Behalf Of Luca
> Ceresoli
> Sent: Thursday, May 22, 2025 12:43 PM
> To: Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>; Maxime Ripard
> <mripard@...nel.org>; Thomas Zimmermann <tzimmermann@...e.de>;
> Hajda, Andrzej <andrzej.hajda@...el.com>; Neil Armstrong
> <neil.armstrong@...aro.org>; Robert Foss <rfoss@...nel.org>; Laurent
> Pinchart <Laurent.pinchart@...asonboard.com>; Jonas Karlman
> <jonas@...boo.se>; Jernej Skrabec <jernej.skrabec@...il.com>; David
> Airlie <airlied@...il.com>; Simona Vetter <simona@...ll.ch>; Ville Syrjala
> <ville.syrjala@...ux.intel.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@...tlin.com>; dri-
> devel@...ts.freedesktop.org; linux-kernel@...r.kernel.org; Luca Ceresoli
> <luca.ceresoli@...tlin.com>
> Subject: [PATCH] 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.

LGTM. Fixes the build error.

Tested-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@...el.com>
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@...el.com>


> 
> Fixes: 5164553d739e ("drm/bridge: add devm_drm_put_bridge()")
> Reported-by: Ville Syrjala <ville.syrjala@...ux.intel.com>
> Closes: https://oftc.catirclogs.org/dri-devel/2025-05-21#34288266;
> Signed-off-by: Luca Ceresoli <luca.ceresoli@...tlin.com>
> ---
>  include/drm/drm_bridge.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index
> 464da28f9134f0fcece5c72a8c5fe7f3e42c7e3d..0af5db244db8580ea0c9af1d9a
> 373b7bf62ee699 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,
> 
> ---
> base-commit: a3436f63aa4f93b043a970cc72a196a501191ecc
> change-id: 20250522-devm_drm_put_bridge-fix-non-of-build-fbb67d28494c
> 
> Best regards,
> --
> Luca Ceresoli <luca.ceresoli@...tlin.com>