lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 17 Sep 2020 01:16:42 +0200 From: Marek Behún <marek.behun@....cz> To: linux-leds@...r.kernel.org Cc: Pavel Machek <pavel@....cz>, Dan Murphy <dmurphy@...com>, Ondřej Jirman <megous@...ous.com>, linux-kernel@...r.kernel.org, Rob Herring <robh+dt@...nel.org>, devicetree@...r.kernel.org, Marek Behún <marek.behun@....cz>, Álvaro Fernández Rojas <noltari@...il.com>, Kevin Cernekee <cernekee@...il.com>, Jaedon Shin <jaedon.shin@...il.com> Subject: [PATCH leds v1 02/10] 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 nor `linux,default-trigger` property. Signed-off-by: Marek Behún <marek.behun@....cz> Cc: Álvaro Fernández Rojas <noltari@...il.com> Cc: Kevin Cernekee <cernekee@...il.com> Cc: Jaedon Shin <jaedon.shin@...il.com> --- drivers/leds/leds-bcm6328.c | 10 ++++------ drivers/leds/leds-bcm6358.c | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c index bad7efb751120..1aa47f3086060 100644 --- a/drivers/leds/leds-bcm6328.c +++ b/drivers/leds/leds-bcm6328.c @@ -328,6 +328,9 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, void __iomem *mem, spinlock_t *lock, unsigned long *blink_leds, unsigned long *blink_delay) { + struct led_init_data init_data = { + .fwnode = of_fwnode_handle(nc), + }; struct bcm6328_led *led; const char *state; int rc; @@ -345,11 +348,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, if (of_property_read_bool(nc, "active-low")) led->active_low = true; - led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name; - led->cdev.default_trigger = of_get_property(nc, - "linux,default-trigger", - NULL); - if (!of_property_read_string(nc, "default-state", &state)) { if (!strcmp(state, "on")) { led->cdev.brightness = LED_FULL; @@ -383,7 +381,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, led->cdev.brightness_set = bcm6328_led_set; led->cdev.blink_set = bcm6328_blink_set; - rc = led_classdev_register(dev, &led->cdev); + rc = led_classdev_register_ext(dev, &led->cdev, &init_data); if (rc < 0) return rc; diff --git a/drivers/leds/leds-bcm6358.c b/drivers/leds/leds-bcm6358.c index 94fefd456ba07..2be38211f5383 100644 --- a/drivers/leds/leds-bcm6358.c +++ b/drivers/leds/leds-bcm6358.c @@ -94,6 +94,9 @@ static void bcm6358_led_set(struct led_classdev *led_cdev, static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, void __iomem *mem, spinlock_t *lock) { + struct led_init_data init_data = { + .fwnode = of_fwnode_handle(nc), + }; struct bcm6358_led *led; const char *state; int rc; @@ -109,11 +112,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, if (of_property_read_bool(nc, "active-low")) led->active_low = true; - led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name; - led->cdev.default_trigger = of_get_property(nc, - "linux,default-trigger", - NULL); - if (!of_property_read_string(nc, "default-state", &state)) { if (!strcmp(state, "on")) { led->cdev.brightness = LED_FULL; @@ -137,7 +135,7 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, led->cdev.brightness_set = bcm6358_led_set; - rc = led_classdev_register(dev, &led->cdev); + rc = led_classdev_register_ext(dev, &led->cdev, &init_data); if (rc < 0) return rc; -- 2.26.2
Powered by blists - more mailing lists