2015-04-09 15:42:43

by Guenter Roeck

Subject: [PATCH -next] leds: Fix build failure seen if LEDS_TRIGGERS is not configured

Fix:

drivers/leds/led-class.c: In function 'brightness_store':
drivers/leds/led-class.c:57: error:
implicit declaration of function 'led_trigger_remove'

seen if LEDS_TRIGGERS is not configured.

Fixes: 5a15d172057c ("leds: unify the location of led-trigger API")
Cc: Jacek Anaszewski <[email protected]>
Signed-off-by: Guenter Roeck <[email protected]>
---
include/linux/leds.h | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 0579708..96a669f 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -223,7 +223,6 @@ struct led_trigger {
struct list_head next_trig;
};

-#ifdef CONFIG_LEDS_TRIGGERS
void led_trigger_set_default(struct led_classdev *led_cdev);
void led_trigger_set(struct led_classdev *led_cdev,
struct led_trigger *trigger);
@@ -234,13 +233,6 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
return led_cdev->trigger_data;
}

-#else
-#define led_trigger_set_default(x) do {} while (0)
-#define led_trigger_set(x, y) do {} while (0)
-#define led_trigger_remove(x) do {} while (0)
-#define led_get_trigger_data(x) (NULL)
-#endif
-
ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count);
ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
@@ -282,6 +274,11 @@ extern void led_trigger_rename_static(const char *name,

#else

+#define led_trigger_set_default(x) do {} while (0)
+#define led_trigger_set(x, y) do {} while (0)
+#define led_trigger_remove(x) do {} while (0)
+#define led_get_trigger_data(x) (NULL)
+
/* Trigger has no members */
struct led_trigger {};

--
2.1.0

2015-04-09 17:35:13

by Bryan Wu

Subject: Re: [PATCH -next] leds: Fix build failure seen if LEDS_TRIGGERS is not configured

On Thu, Apr 9, 2015 at 8:42 AM, Guenter Roeck <[email protected]> wrote:
> Fix:
>
> drivers/leds/led-class.c: In function 'brightness_store':
> drivers/leds/led-class.c:57: error:
> implicit declaration of function 'led_trigger_remove'
>
> seen if LEDS_TRIGGERS is not configured.
>

Thanks for patching this. Jacek got a fix then.
-Bryan

> Fixes: 5a15d172057c ("leds: unify the location of led-trigger API")
> Cc: Jacek Anaszewski <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>
> ---
> include/linux/leds.h | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/include/linux/leds.h b/include/linux/leds.h
> index 0579708..96a669f 100644
> --- a/include/linux/leds.h
> +++ b/include/linux/leds.h
> @@ -223,7 +223,6 @@ struct led_trigger {
> struct list_head next_trig;
> };
>
> -#ifdef CONFIG_LEDS_TRIGGERS
> void led_trigger_set_default(struct led_classdev *led_cdev);
> void led_trigger_set(struct led_classdev *led_cdev,
> struct led_trigger *trigger);
> @@ -234,13 +233,6 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
> return led_cdev->trigger_data;
> }
>
> -#else
> -#define led_trigger_set_default(x) do {} while (0)
> -#define led_trigger_set(x, y) do {} while (0)
> -#define led_trigger_remove(x) do {} while (0)
> -#define led_get_trigger_data(x) (NULL)
> -#endif
> -
> ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
> const char *buf, size_t count);
> ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
> @@ -282,6 +274,11 @@ extern void led_trigger_rename_static(const char *name,
>
> #else
>
> +#define led_trigger_set_default(x) do {} while (0)
> +#define led_trigger_set(x, y) do {} while (0)
> +#define led_trigger_remove(x) do {} while (0)
> +#define led_get_trigger_data(x) (NULL)
> +
> /* Trigger has no members */
> struct led_trigger {};
>
> --
> 2.1.0
>