Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-18 19:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

leds: lm3532: don't parse label DT property

Browse Source 
This driver uses extended LED registration, so we do not need to parse
the `label` DT property on our own.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
This commit is contained in:
Marek Behún 2020-09-19 20:03:02 +02:00 committed by Pavel Machek
parent 60bbd9d411
commit 4b64c0510b
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/leds/leds-lm3532.c
View File

@ -129,7 +129,6 @@ struct lm3532_als_data {
* @full_scale_current - The full-scale current setting for the current sink. * @full_scale_current - The full-scale current setting for the current sink.
* @led_strings - The LED strings supported in this array * @led_strings - The LED strings supported in this array
* @enabled - Enabled status * @enabled - Enabled status
* @label - LED label
*/ */
struct lm3532_led { struct lm3532_led {
struct led_classdev led_dev; struct led_classdev led_dev;
@ -142,7 +141,6 @@ struct lm3532_led {
int full_scale_current; int full_scale_current;
unsigned int enabled:1; unsigned int enabled:1;
u32 led_strings[LM3532_MAX_CONTROL_BANKS]; u32 led_strings[LM3532_MAX_CONTROL_BANKS];
char label[LED_MAX_NAME_SIZE];
}; };
/** /**
@ -548,7 +546,6 @@ static int lm3532_parse_node(struct lm3532_data *priv)
{ {
struct fwnode_handle *child = NULL; struct fwnode_handle *child = NULL;
struct lm3532_led *led; struct lm3532_led *led;
const char *name;
int control_bank; int control_bank;
u32 ramp_time; u32 ramp_time;
size_t i = 0; size_t i = 0;
@ -646,16 +643,7 @@ static int lm3532_parse_node(struct lm3532_data *priv)
fwnode_property_read_string(child, "linux,default-trigger", fwnode_property_read_string(child, "linux,default-trigger",
&led->led_dev.default_trigger); &led->led_dev.default_trigger);
ret = fwnode_property_read_string(child, "label", &name);
if (ret)
snprintf(led->label, sizeof(led->label),
"%s::", priv->client->name);
else
snprintf(led->label, sizeof(led->label),
"%s:%s", priv->client->name, name);
led->priv = priv; led->priv = priv;
led->led_dev.name = led->label;
led->led_dev.brightness_set_blocking = lm3532_brightness_set; led->led_dev.brightness_set_blocking = lm3532_brightness_set;
ret = devm_led_classdev_register_ext(priv->dev, &led->led_dev, &idata); ret = devm_led_classdev_register_ext(priv->dev, &led->led_dev, &idata);