From: Dan Murphy <dmurphy@ti.com>
To: <rpurdie@rpsys.net>, <jacek.anaszewski@gmail.com>, <pavel@ucw.cz>
Cc: <linux-leds@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Dan Murphy <dmurphy@ti.com>
Subject: [PATCH v6 6/6] leds: as3645a: Update the LED label generation
Date: Fri, 1 Dec 2017 10:56:13 -0600 [thread overview]
Message-ID: <20171201165613.10358-6-dmurphy@ti.com> (raw)
In-Reply-To: <20171201165613.10358-1-dmurphy@ti.com>
Update the LED label creationg to call the
of_led_compose_name api to generate a label.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
v6 - New patch to use the new LED class API
drivers/leds/leds-as3645a.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c
index 9a257f969300..5a29db115277 100644
--- a/drivers/leds/leds-as3645a.c
+++ b/drivers/leds/leds-as3645a.c
@@ -27,6 +27,7 @@
#include <linux/mutex.h>
#include <linux/of.h>
#include <linux/slab.h>
+#include <uapi/linux/uleds.h>
#include <media/v4l2-flash-led-class.h>
@@ -133,8 +134,8 @@ struct as3645a_config {
};
struct as3645a_names {
- char flash[32];
- char indicator[32];
+ char flash[LED_MAX_NAME_SIZE];
+ char indicator[LED_MAX_NAME_SIZE];
};
struct as3645a {
@@ -496,7 +497,6 @@ static int as3645a_parse_node(struct as3645a *flash,
{
struct as3645a_config *cfg = &flash->cfg;
struct device_node *child;
- const char *name;
int rval;
for_each_child_of_node(node, child) {
@@ -523,12 +523,9 @@ static int as3645a_parse_node(struct as3645a *flash,
return -ENODEV;
}
- rval = of_property_read_string(flash->flash_node, "label", &name);
- if (!rval)
- strlcpy(names->flash, name, sizeof(names->flash));
- else
- snprintf(names->flash, sizeof(names->flash),
- "%s:flash", node->name);
+ of_led_compose_name(node, flash->flash_node, "flash",
+ sizeof("flash"),
+ names->flash);
rval = of_property_read_u32(flash->flash_node, "flash-timeout-us",
&cfg->flash_timeout_us);
@@ -567,12 +564,9 @@ static int as3645a_parse_node(struct as3645a *flash,
goto out_err;
}
- rval = of_property_read_string(flash->indicator_node, "label", &name);
- if (!rval)
- strlcpy(names->indicator, name, sizeof(names->indicator));
- else
- snprintf(names->indicator, sizeof(names->indicator),
- "%s:indicator", node->name);
+ of_led_compose_name(node, flash->indicator_node, "indicator",
+ sizeof("indicator"),
+ names->indicator);
rval = of_property_read_u32(flash->indicator_node, "led-max-microamp",
&cfg->indicator_max_ua);
--
2.15.0.124.g7668cbc60
next prev parent reply other threads:[~2017-12-01 16:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-01 16:56 [PATCH v6 1/6] leds: Add new API to derive a LED name Dan Murphy
2017-12-01 16:56 ` [PATCH v6 2/6] dt: bindings: lm3692x: Add bindings for lm3692x LED driver Dan Murphy
2017-12-01 16:56 ` [PATCH v6 3/6] leds: lm3692x: Introduce LM3692x dual string driver Dan Murphy
2017-12-01 16:56 ` [PATCH v6 4/6] dt: bindings: lp8860: Update the bindings to the standard Dan Murphy
2017-12-03 13:27 ` Jacek Anaszewski
2017-12-04 22:35 ` Rob Herring
2017-12-05 13:06 ` Dan Murphy
2017-12-03 13:49 ` Jacek Anaszewski
2017-12-03 14:34 ` Jacek Anaszewski
2017-12-01 16:56 ` [PATCH v6 5/6] leds: lp8860: Update the LED label generation Dan Murphy
2017-12-01 16:59 ` Dan Murphy
2017-12-03 14:00 ` Jacek Anaszewski
2017-12-03 13:57 ` Jacek Anaszewski
2017-12-04 13:11 ` Dan Murphy
2017-12-05 19:56 ` Jacek Anaszewski
2017-12-05 19:59 ` Dan Murphy
2017-12-01 16:56 ` Dan Murphy [this message]
2017-12-01 16:58 ` [PATCH v6 6/6] leds: as3645a: " Dan Murphy
2017-12-03 13:27 ` [PATCH v6 1/6] leds: Add new API to derive a LED name Jacek Anaszewski
2017-12-04 13:09 ` Dan Murphy
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=20171201165613.10358-6-dmurphy@ti.com \
--to=dmurphy@ti.com \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--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;
as well as URLs for NNTP newsgroup(s).