2016-10-26 08:59:25

by Arnd Bergmann

Subject: [PATCH] drm: mark drm_of_component_match_add dummy inline

The newly added drm_of_component_match_add helper is defined as
'static' in a header when CONFIG_OF is disabled, causing a warning
each time the header is included:

In file included from /git/arm-soc/drivers/gpu/drm/bridge/dw-hdmi.c:23:0:
include/drm/drm_of.h:33:13: error: 'drm_of_component_match_add' defined but not used [-Werror=unused-function]

This marks it 'inline' like the other such helpers in this file.

Fixes: 97ac0e47aed5 ("drm: convert DT component matching to component_match_add_release()")
Signed-off-by: Arnd Bergmann <[email protected]>
---
include/drm/drm_of.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h
index d6b4c5587bbe..26a64805cc15 100644
--- a/include/drm/drm_of.h
+++ b/include/drm/drm_of.h
@@ -30,10 +30,11 @@ static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
return 0;
}

-static void drm_of_component_match_add(struct device *master,
- struct component_match **matchptr,
- int (*compare)(struct device *, void *),
- struct device_node *node)
+static inline void
+drm_of_component_match_add(struct device *master,
+ struct component_match **matchptr,
+ int (*compare)(struct device *, void *),
+ struct device_node *node)
{
}

--
2.9.0

2016-10-26 20:00:16

by Sean Paul

Subject: Re: [PATCH] drm: mark drm_of_component_match_add dummy inline

On Wed, Oct 26, 2016 at 4:57 AM, Arnd Bergmann <[email protected]> wrote:
> The newly added drm_of_component_match_add helper is defined as
> 'static' in a header when CONFIG_OF is disabled, causing a warning
> each time the header is included:
>
> In file included from /git/arm-soc/drivers/gpu/drm/bridge/dw-hdmi.c:23:0:
> include/drm/drm_of.h:33:13: error: 'drm_of_component_match_add' defined but not used [-Werror=unused-function]
>
> This marks it 'inline' like the other such helpers in this file.
>
> Fixes: 97ac0e47aed5 ("drm: convert DT component matching to component_match_add_release()")
> Signed-off-by: Arnd Bergmann <[email protected]>

Applied to drm-misc, thanks

Sean

> ---
> include/drm/drm_of.h | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h
> index d6b4c5587bbe..26a64805cc15 100644
> --- a/include/drm/drm_of.h
> +++ b/include/drm/drm_of.h
> @@ -30,10 +30,11 @@ static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
> return 0;
> }
>
> -static void drm_of_component_match_add(struct device *master,
> - struct component_match **matchptr,
> - int (*compare)(struct device *, void *),
> - struct device_node *node)
> +static inline void
> +drm_of_component_match_add(struct device *master,
> + struct component_match **matchptr,
> + int (*compare)(struct device *, void *),
> + struct device_node *node)
> {
> }
>
> --
> 2.9.0
>