From: Hubert Feurstein <h.feurstein@gmail.com>
To: barebox@lists.infradead.org
Cc: Hubert Feurstein <h.feurstein@gmail.com>
Subject: [PATCH 3/4] led: check for 'barebox, default-trigger' when 'linux, default-trigger' is not found
Date: Tue, 10 Dec 2019 18:13:03 +0100 [thread overview]
Message-ID: <20191210171305.24276-3-h.feurstein@gmail.com> (raw)
In-Reply-To: <20191210171305.24276-1-h.feurstein@gmail.com>
When the linux,default-trigger is not found by barebox, then also check if
there might be a barebox,default-trigger.
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
drivers/led/core.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/led/core.c b/drivers/led/core.c
index fec7324e7..4bf19abcc 100644
--- a/drivers/led/core.c
+++ b/drivers/led/core.c
@@ -274,6 +274,9 @@ enum led_trigger trigger_by_name(const char *name)
{
int i;
+ if (!name)
+ return LED_TRIGGER_MAX;
+
for (i = 0; i < LED_TRIGGER_MAX; i++)
if (!strcmp(name, trigger_names[i]))
return i;
@@ -287,13 +290,13 @@ void led_of_parse_trigger(struct led *led, struct device_node *np)
const char *trigger;
trigger = of_get_property(np, "linux,default-trigger", NULL);
- if (!trigger)
- trigger = of_get_property(np, "barebox,default-trigger", NULL);
+ trg = trigger_by_name(trigger);
- if (!trigger)
- return;
+ if (trg == LED_TRIGGER_MAX) {
+ trigger = of_get_property(np, "barebox,default-trigger", NULL);
+ trg = trigger_by_name(trigger);
+ }
- trg = trigger_by_name(trigger);
if (trg != LED_TRIGGER_MAX) {
/* disable LED before installing trigger */
led_set(led, 0);
--
2.24.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-12-10 17:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 17:13 [PATCH 1/4] led: unify led trigger tables Hubert Feurstein
2019-12-10 17:13 ` [PATCH 2/4] led: add documentation for net-tx and net-rx triggers Hubert Feurstein
2019-12-10 17:13 ` Hubert Feurstein [this message]
2019-12-10 17:13 ` [PATCH 4/4] led: parse panic-indicator from device-tree Hubert Feurstein
2019-12-11 8:39 ` [PATCH 1/4] led: unify led trigger tables Sascha Hauer
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=20191210171305.24276-3-h.feurstein@gmail.com \
--to=h.feurstein@gmail.com \
--cc=barebox@lists.infradead.org \
/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