From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
This patch is just a check to let the kbuild test robot find triggers
I forgot to update.
---
drivers/leds/led-triggers.c | 5 ++---
include/linux/leds.h | 8 +++-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 32c44e13683b..409e8eba3ef7 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -129,8 +129,7 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)
led_cdev->trigger->deactivate(led_cdev);
device_remove_groups(led_cdev->dev, led_cdev->trigger->groups);
led_cdev->trigger = NULL;
- led_cdev->trigger_data = NULL;
- led_cdev->activated = false;
+ led_cdev->_trigger_data = NULL;
led_set_brightness(led_cdev, LED_OFF);
}
if (trig) {
@@ -172,7 +171,7 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)
err_activate:
led_cdev->trigger = NULL;
- led_cdev->trigger_data = NULL;
+ led_cdev->_trigger_data = NULL;
write_lock_irqsave(&led_cdev->trigger->leddev_list_lock, flags);
list_del(&led_cdev->trig_list);
write_unlock_irqrestore(&led_cdev->trigger->leddev_list_lock, flags);
diff --git a/include/linux/leds.h b/include/linux/leds.h
index ee90e041d5c1..985759b1a05e 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -109,9 +109,7 @@ struct led_classdev {
struct led_trigger *trigger;
struct list_head trig_list;
- void *trigger_data;
- /* true if activated - deactivate routine uses it to do cleanup */
- bool activated;
+ void *_trigger_data;
#endif
#ifdef CONFIG_LEDS_BRIGHTNESS_HW_CHANGED
@@ -306,12 +304,12 @@ extern void led_trigger_remove(struct led_classdev *led_cdev);
static inline void led_set_trigger_data(struct led_classdev *led_cdev,
void *trigger_data)
{
- led_cdev->trigger_data = trigger_data;
+ led_cdev->_trigger_data = trigger_data;
}
static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
{
- return led_cdev->trigger_data;
+ return led_cdev->_trigger_data;
}
#define module_led_trigger(__led_trigger) \
--
2.17.1
