2014-11-04 00:56:11

by Heiko Stuebner

Subject: [PATCH] backlight: extend of_find_backlight_by_node stub-check to modules

Commit de3d75dc2311 ("backlight: Use of_find_backlight_by_node stub when
backlight class disabled") did not take into account that the backlight
class can also be compiled as module. Extend the check to prevent
redefinition warnings when the backlight device class is compiled as module.

Reported-by: kbuild test robot
Signed-off-by: Heiko Stuebner <[email protected]>
---
include/linux/backlight.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index d9cb644..92b9817 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -157,7 +157,8 @@ struct generic_bl_info {
void (*kick_battery)(void);
};

-#if defined(CONFIG_OF) && defined(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if defined(CONFIG_OF) && (defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
+ defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE))
struct backlight_device *of_find_backlight_by_node(struct device_node *node);
#else
static inline struct backlight_device *
--
2.0.1

2014-11-04 01:07:42

by Jingoo Han

Subject: Re: [PATCH] backlight: extend of_find_backlight_by_node stub-check to modules

On Tuesday, November 04, 2014 9:59 AM, Heiko St?bner wrote:
>
> Commit de3d75dc2311 ("backlight: Use of_find_backlight_by_node stub when
> backlight class disabled") did not take into account that the backlight
> class can also be compiled as module. Extend the check to prevent
> redefinition warnings when the backlight device class is compiled as module.
>
> Reported-by: kbuild test robot
> Signed-off-by: Heiko Stuebner <[email protected]>

Acked-by: Jingoo Han <[email protected]>

If there is no objection, I hope that this patch is merged.
Thank you.

Best regards,
Jingoo Han

> ---
> include/linux/backlight.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/backlight.h b/include/linux/backlight.h
> index d9cb644..92b9817 100644
> --- a/include/linux/backlight.h
> +++ b/include/linux/backlight.h
> @@ -157,7 +157,8 @@ struct generic_bl_info {
> void (*kick_battery)(void);
> };
>
> -#if defined(CONFIG_OF) && defined(CONFIG_BACKLIGHT_CLASS_DEVICE)
> +#if defined(CONFIG_OF) && (defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
> + defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE))
> struct backlight_device *of_find_backlight_by_node(struct device_node *node);
> #else
> static inline struct backlight_device *
> --
> 2.0.1

2014-11-04 08:25:20

by Lee Jones

Subject: Re: [PATCH] backlight: extend of_find_backlight_by_node stub-check to modules

On Tue, 04 Nov 2014, Heiko Stübner wrote:

> Commit de3d75dc2311 ("backlight: Use of_find_backlight_by_node stub when
> backlight class disabled") did not take into account that the backlight
> class can also be compiled as module. Extend the check to prevent
> redefinition warnings when the backlight device class is compiled as module.
>
> Reported-by: kbuild test robot
> Signed-off-by: Heiko Stuebner <[email protected]>
> ---
> include/linux/backlight.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

Applied with Jingoo's Ack.

> diff --git a/include/linux/backlight.h b/include/linux/backlight.h
> index d9cb644..92b9817 100644
> --- a/include/linux/backlight.h
> +++ b/include/linux/backlight.h
> @@ -157,7 +157,8 @@ struct generic_bl_info {
> void (*kick_battery)(void);
> };
>
> -#if defined(CONFIG_OF) && defined(CONFIG_BACKLIGHT_CLASS_DEVICE)
> +#if defined(CONFIG_OF) && (defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
> + defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE))
> struct backlight_device *of_find_backlight_by_node(struct device_node *node);
> #else
> static inline struct backlight_device *

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog