Commit e4e912a3 authored by Marek Behún's avatar Marek Behún Committed by Pavel Machek

leds: bcm6328, bcm6358: use struct led_init_data when registering

By using struct led_init_data when registering we do not need to parse
`label` DT property. Moreover `label` is deprecated and if it is not
present but `color` and `function` are, LED core will compose a name
from these properties instead.
Signed-off-by: default avatarMarek Behún <marek.behun@nic.cz>
Cc: Álvaro Fernández Rojas <noltari@gmail.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jaedon Shin <jaedon.shin@gmail.com>
Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
parent ff5c89d4
...@@ -328,6 +328,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, ...@@ -328,6 +328,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
void __iomem *mem, spinlock_t *lock, void __iomem *mem, spinlock_t *lock,
unsigned long *blink_leds, unsigned long *blink_delay) unsigned long *blink_leds, unsigned long *blink_delay)
{ {
struct led_init_data init_data = {};
struct bcm6328_led *led; struct bcm6328_led *led;
const char *state; const char *state;
int rc; int rc;
...@@ -345,7 +346,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, ...@@ -345,7 +346,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
if (of_property_read_bool(nc, "active-low")) if (of_property_read_bool(nc, "active-low"))
led->active_low = true; led->active_low = true;
led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
led->cdev.default_trigger = of_get_property(nc, led->cdev.default_trigger = of_get_property(nc,
"linux,default-trigger", "linux,default-trigger",
NULL); NULL);
...@@ -382,8 +382,9 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, ...@@ -382,8 +382,9 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
led->cdev.brightness_set = bcm6328_led_set; led->cdev.brightness_set = bcm6328_led_set;
led->cdev.blink_set = bcm6328_blink_set; led->cdev.blink_set = bcm6328_blink_set;
init_data.fwnode = of_fwnode_handle(nc);
rc = devm_led_classdev_register(dev, &led->cdev); rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
if (rc < 0) if (rc < 0)
return rc; return rc;
......
...@@ -94,6 +94,7 @@ static void bcm6358_led_set(struct led_classdev *led_cdev, ...@@ -94,6 +94,7 @@ static void bcm6358_led_set(struct led_classdev *led_cdev,
static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
void __iomem *mem, spinlock_t *lock) void __iomem *mem, spinlock_t *lock)
{ {
struct led_init_data init_data = {};
struct bcm6358_led *led; struct bcm6358_led *led;
const char *state; const char *state;
int rc; int rc;
...@@ -109,7 +110,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, ...@@ -109,7 +110,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
if (of_property_read_bool(nc, "active-low")) if (of_property_read_bool(nc, "active-low"))
led->active_low = true; led->active_low = true;
led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
led->cdev.default_trigger = of_get_property(nc, led->cdev.default_trigger = of_get_property(nc,
"linux,default-trigger", "linux,default-trigger",
NULL); NULL);
...@@ -136,8 +136,9 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, ...@@ -136,8 +136,9 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
bcm6358_led_set(&led->cdev, led->cdev.brightness); bcm6358_led_set(&led->cdev, led->cdev.brightness);
led->cdev.brightness_set = bcm6358_led_set; led->cdev.brightness_set = bcm6358_led_set;
init_data.fwnode = of_fwnode_handle(nc);
rc = devm_led_classdev_register(dev, &led->cdev); rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
if (rc < 0) if (rc < 0)
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment