shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "leds: trigger: Store brightness set by led_trigger_event()"

Browse Source 
This reverts commit 2bc78ff25f which is
commit 822c91e72eac568ed8d83765634f00decb45666c upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: If8dc383e04251ba799709f922a570097a65982ac
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-09-14 14:36:55 +00:00
parent 35455634f9
commit 20c4ef91bd
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/leds/led-triggers.c
View File

@@ -193,11 +193,11 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)
spin_unlock(&trig->leddev_list_lock); spin_unlock(&trig->leddev_list_lock);
led_cdev->trigger = trig; led_cdev->trigger = trig;
ret = 0;
if (trig->activate) if (trig->activate)
ret = trig->activate(led_cdev); ret = trig->activate(led_cdev);
else else
led_set_brightness(led_cdev, trig->brightness); ret = 0;
if (ret) if (ret)
goto err_activate; goto err_activate;
@@ -372,8 +372,6 @@ void led_trigger_event(struct led_trigger *trig,
if (!trig) if (!trig)
return; return;
trig->brightness = brightness;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(led_cdev, &trig->led_cdevs, trig_list) list_for_each_entry_rcu(led_cdev, &trig->led_cdevs, trig_list)
led_set_brightness(led_cdev, brightness); led_set_brightness(led_cdev, brightness);

15
include/linux/leds.h
View File

@@ -356,9 +356,6 @@ struct led_trigger {
int (*activate)(struct led_classdev *led_cdev); int (*activate)(struct led_classdev *led_cdev);
void (*deactivate)(struct led_classdev *led_cdev); void (*deactivate)(struct led_classdev *led_cdev);
/* Brightness set by led_trigger_event */
enum led_brightness brightness;
/* LED-private triggers have this set */ /* LED-private triggers have this set */
struct led_hw_trigger_type *trigger_type; struct led_hw_trigger_type *trigger_type;
@@ -412,12 +409,6 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
return led_cdev->trigger_data; return led_cdev->trigger_data;
} }
static inline enum led_brightness
led_trigger_get_brightness(const struct led_trigger *trigger)
{
return trigger ? trigger->brightness : LED_OFF;
}
#define module_led_trigger(__led_trigger) \ #define module_led_trigger(__led_trigger) \
module_driver(__led_trigger, led_trigger_register, \ module_driver(__led_trigger, led_trigger_register, \
led_trigger_unregister) led_trigger_unregister)
@@ -454,12 +445,6 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
return NULL; return NULL;
} }
static inline enum led_brightness
led_trigger_get_brightness(const struct led_trigger *trigger)
{
return LED_OFF;
}
#endif /* CONFIG_LEDS_TRIGGERS */ #endif /* CONFIG_LEDS_TRIGGERS */
/* Trigger specific functions */ /* Trigger specific functions */