* [PATCH] drm/bridge: fix build with CONFIG_OF=n
@ 2025-05-22 7:12 Luca Ceresoli
2025-05-22 7:58 ` Borah, Chaitanya Kumar
0 siblings, 1 reply; 3+ messages in thread
From: Luca Ceresoli @ 2025-05-22 7:12 UTC (permalink / raw)
To: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
Andrzej Hajda, Neil Armstrong, Robert Foss, Laurent Pinchart,
Jonas Karlman, Jernej Skrabec, David Airlie, Simona Vetter,
Ville Syrjala
Cc: Thomas Petazzoni, dri-devel, linux-kernel, Luca Ceresoli
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;
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.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..0af5db244db8580ea0c9af1d9a373b7bf62ee699 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@bootlin.com>
^ permalink raw reply related [flat|nested] 3+ messages in thread* RE: [PATCH] drm/bridge: fix build with CONFIG_OF=n
2025-05-22 7:12 [PATCH] drm/bridge: fix build with CONFIG_OF=n Luca Ceresoli
@ 2025-05-22 7:58 ` Borah, Chaitanya Kumar
2025-05-22 9:22 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Borah, Chaitanya Kumar @ 2025-05-22 7:58 UTC (permalink / raw)
To: Luca Ceresoli, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, Hajda, Andrzej, Neil Armstrong, Robert Foss,
Laurent Pinchart, Jonas Karlman, Jernej Skrabec, David Airlie,
Simona Vetter, Ville Syrjala
Cc: Thomas Petazzoni, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
> -----Original Message-----
> From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of Luca
> Ceresoli
> Sent: Thursday, May 22, 2025 12:43 PM
> To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Maxime Ripard
> <mripard@kernel.org>; Thomas Zimmermann <tzimmermann@suse.de>;
> Hajda, Andrzej <andrzej.hajda@intel.com>; Neil Armstrong
> <neil.armstrong@linaro.org>; Robert Foss <rfoss@kernel.org>; Laurent
> Pinchart <Laurent.pinchart@ideasonboard.com>; Jonas Karlman
> <jonas@kwiboo.se>; Jernej Skrabec <jernej.skrabec@gmail.com>; David
> Airlie <airlied@gmail.com>; Simona Vetter <simona@ffwll.ch>; Ville Syrjala
> <ville.syrjala@linux.intel.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>; dri-
> devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; Luca Ceresoli
> <luca.ceresoli@bootlin.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@intel.com>
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
>
> 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;
> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.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@bootlin.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH] drm/bridge: fix build with CONFIG_OF=n
2025-05-22 7:58 ` Borah, Chaitanya Kumar
@ 2025-05-22 9:22 ` Jani Nikula
0 siblings, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2025-05-22 9:22 UTC (permalink / raw)
To: Borah, Chaitanya Kumar, Luca Ceresoli, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Hajda, Andrzej, Neil Armstrong,
Robert Foss, Laurent Pinchart, Jonas Karlman, Jernej Skrabec,
David Airlie, Simona Vetter, Ville Syrjala
Cc: Thomas Petazzoni, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
On Thu, 22 May 2025, "Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com> wrote:
>> -----Original Message-----
>> From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of Luca
>> Ceresoli
>> Sent: Thursday, May 22, 2025 12:43 PM
>> To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Maxime Ripard
>> <mripard@kernel.org>; Thomas Zimmermann <tzimmermann@suse.de>;
>> Hajda, Andrzej <andrzej.hajda@intel.com>; Neil Armstrong
>> <neil.armstrong@linaro.org>; Robert Foss <rfoss@kernel.org>; Laurent
>> Pinchart <Laurent.pinchart@ideasonboard.com>; Jonas Karlman
>> <jonas@kwiboo.se>; Jernej Skrabec <jernej.skrabec@gmail.com>; David
>> Airlie <airlied@gmail.com>; Simona Vetter <simona@ffwll.ch>; Ville Syrjala
>> <ville.syrjala@linux.intel.com>
>> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>; dri-
>> devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; Luca Ceresoli
>> <luca.ceresoli@bootlin.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@intel.com>
> Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Ditto. Please merge.
BR,
Jani.
>
>
>>
>> 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;
>> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.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@bootlin.com>
>
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-22 9:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-22 7:12 [PATCH] drm/bridge: fix build with CONFIG_OF=n Luca Ceresoli
2025-05-22 7:58 ` Borah, Chaitanya Kumar
2025-05-22 9:22 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).