From: Guenter Roeck <linux@roeck-us.net>
To: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>,
linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org,
Guenter Roeck <linux@roeck-us.net>,
Jacek Anaszewski <j.anaszewski@samsung.com>
Subject: [PATCH -next] leds: Fix build failure seen if LEDS_TRIGGERS is not configured
Date: Thu, 9 Apr 2015 08:42:20 -0700 [thread overview]
Message-ID: <1428594140-16832-1-git-send-email-linux@roeck-us.net> (raw)
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 <j.anaszewski@samsung.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
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
next reply other threads:[~2015-04-09 15:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-09 15:42 Guenter Roeck [this message]
2015-04-09 17:34 ` Bryan Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428594140-16832-1-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=cooloney@gmail.com \
--cc=j.anaszewski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=rpurdie@rpsys.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®