mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

leds: syscon: Get rid of custom led_init_default_state_get() 

LED core provides a helper to parse default state from firmware node.
Use it instead of custom implementation.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230103131256.33894-11-andriy.shevchenko@linux.intel.com
This commit is contained in:
Andy Shevchenko 2023-01-03 15:12:55 +02:00 committed by Lee Jones
parent bf8a9a7684
commit 265d313ee6
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/leds/leds-syscon.c
View File

@ -61,7 +61,8 @@ static int syscon_led_probe(struct platform_device *pdev)
struct device *parent; struct device *parent;
struct regmap *map; struct regmap *map;
struct syscon_led *sled; struct syscon_led *sled;
const char *state; enum led_default_state state;
u32 value;
int ret; int ret;
parent = dev->parent; parent = dev->parent;
@ -86,34 +87,30 @@ static int syscon_led_probe(struct platform_device *pdev)
if (of_property_read_u32(np, "mask", &sled->mask)) if (of_property_read_u32(np, "mask", &sled->mask))
return -EINVAL; return -EINVAL;
state = of_get_property(np, "default-state", NULL); init_data.fwnode = of_fwnode_handle(np);
if (state) {
if (!strcmp(state, "keep")) {
u32 val;
ret = regmap_read(map, sled->offset, &val); state = led_init_default_state_get(init_data.fwnode);
if (ret < 0) switch (state) {
return ret; case LEDS_DEFSTATE_ON:
sled->state = !!(val & sled->mask); ret = regmap_update_bits(map, sled->offset, sled->mask, sled->mask);
} else if (!strcmp(state, "on")) { if (ret < 0)
sled->state = true; return ret;
ret = regmap_update_bits(map, sled->offset, sled->state = true;
sled->mask, break;
sled->mask); case LEDS_DEFSTATE_KEEP:
if (ret < 0) ret = regmap_read(map, sled->offset, &value);
return ret; if (ret < 0)
} else { return ret;
sled->state = false; sled->state = !!(value & sled->mask);
ret = regmap_update_bits(map, sled->offset, break;
sled->mask, 0); default:
if (ret < 0) ret = regmap_update_bits(map, sled->offset, sled->mask, 0);
return ret; if (ret < 0)
} return ret;
sled->state = false;
} }
sled->cdev.brightness_set = syscon_led_set; sled->cdev.brightness_set = syscon_led_set;
init_data.fwnode = of_fwnode_handle(np);
ret = devm_led_classdev_register_ext(dev, &sled->cdev, &init_data); ret = devm_led_classdev_register_ext(dev, &sled->cdev, &init_data);
if (ret < 0) if (ret < 0)
return ret; return ret;