diff options
author | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-11-14 05:50:18 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2014-11-14 17:29:35 -0500 |
commit | 4d71a4a12b130ad033219e6f58c74a64059415eb (patch) | |
tree | 5b9560719835c5a204b92f4bb7e44aae6793281c /drivers/leds/trigger | |
parent | acd899e4f3066b6662f6047da5b795cc762093cb (diff) |
leds: Add support for setting brightness in a synchronous way
There are use cases when setting a LED brightness has to
have immediate effect (e.g. setting a torch LED brightness).
This patch extends LED subsystem to support such operations.
The LED subsystem internal API __led_set_brightness is changed
to led_set_brightness_async and new led_set_brightness_sync API
is added.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds/trigger')
-rw-r--r-- | drivers/leds/trigger/ledtrig-backlight.c | 8 | ||||
-rw-r--r-- | drivers/leds/trigger/ledtrig-default-on.c | 2 | ||||
-rw-r--r-- | drivers/leds/trigger/ledtrig-gpio.c | 6 | ||||
-rw-r--r-- | drivers/leds/trigger/ledtrig-heartbeat.c | 2 | ||||
-rw-r--r-- | drivers/leds/trigger/ledtrig-oneshot.c | 4 | ||||
-rw-r--r-- | drivers/leds/trigger/ledtrig-transient.c | 10 |
6 files changed, 17 insertions, 15 deletions
diff --git a/drivers/leds/trigger/ledtrig-backlight.c b/drivers/leds/trigger/ledtrig-backlight.c index 47e55aa9eefa..59eca17d9661 100644 --- a/drivers/leds/trigger/ledtrig-backlight.c +++ b/drivers/leds/trigger/ledtrig-backlight.c | |||
@@ -51,9 +51,9 @@ static int fb_notifier_callback(struct notifier_block *p, | |||
51 | 51 | ||
52 | if ((n->old_status == UNBLANK) ^ n->invert) { | 52 | if ((n->old_status == UNBLANK) ^ n->invert) { |
53 | n->brightness = led->brightness; | 53 | n->brightness = led->brightness; |
54 | __led_set_brightness(led, LED_OFF); | 54 | led_set_brightness_async(led, LED_OFF); |
55 | } else { | 55 | } else { |
56 | __led_set_brightness(led, n->brightness); | 56 | led_set_brightness_async(led, n->brightness); |
57 | } | 57 | } |
58 | 58 | ||
59 | n->old_status = new_status; | 59 | n->old_status = new_status; |
@@ -89,9 +89,9 @@ static ssize_t bl_trig_invert_store(struct device *dev, | |||
89 | 89 | ||
90 | /* After inverting, we need to update the LED. */ | 90 | /* After inverting, we need to update the LED. */ |
91 | if ((n->old_status == BLANK) ^ n->invert) | 91 | if ((n->old_status == BLANK) ^ n->invert) |
92 | __led_set_brightness(led, LED_OFF); | 92 | led_set_brightness_async(led, LED_OFF); |
93 | else | 93 | else |
94 | __led_set_brightness(led, n->brightness); | 94 | led_set_brightness_async(led, n->brightness); |
95 | 95 | ||
96 | return num; | 96 | return num; |
97 | } | 97 | } |
diff --git a/drivers/leds/trigger/ledtrig-default-on.c b/drivers/leds/trigger/ledtrig-default-on.c index 81a91be8e18d..6f38f883aaf1 100644 --- a/drivers/leds/trigger/ledtrig-default-on.c +++ b/drivers/leds/trigger/ledtrig-default-on.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | static void defon_trig_activate(struct led_classdev *led_cdev) | 20 | static void defon_trig_activate(struct led_classdev *led_cdev) |
21 | { | 21 | { |
22 | __led_set_brightness(led_cdev, led_cdev->max_brightness); | 22 | led_set_brightness_async(led_cdev, led_cdev->max_brightness); |
23 | } | 23 | } |
24 | 24 | ||
25 | static struct led_trigger defon_led_trigger = { | 25 | static struct led_trigger defon_led_trigger = { |
diff --git a/drivers/leds/trigger/ledtrig-gpio.c b/drivers/leds/trigger/ledtrig-gpio.c index c86c41826476..4cc7040746c6 100644 --- a/drivers/leds/trigger/ledtrig-gpio.c +++ b/drivers/leds/trigger/ledtrig-gpio.c | |||
@@ -54,12 +54,12 @@ static void gpio_trig_work(struct work_struct *work) | |||
54 | 54 | ||
55 | if (tmp) { | 55 | if (tmp) { |
56 | if (gpio_data->desired_brightness) | 56 | if (gpio_data->desired_brightness) |
57 | __led_set_brightness(gpio_data->led, | 57 | led_set_brightness_async(gpio_data->led, |
58 | gpio_data->desired_brightness); | 58 | gpio_data->desired_brightness); |
59 | else | 59 | else |
60 | __led_set_brightness(gpio_data->led, LED_FULL); | 60 | led_set_brightness_async(gpio_data->led, LED_FULL); |
61 | } else { | 61 | } else { |
62 | __led_set_brightness(gpio_data->led, LED_OFF); | 62 | led_set_brightness_async(gpio_data->led, LED_OFF); |
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c index 5c8464a33172..fea6871d2609 100644 --- a/drivers/leds/trigger/ledtrig-heartbeat.c +++ b/drivers/leds/trigger/ledtrig-heartbeat.c | |||
@@ -74,7 +74,7 @@ static void led_heartbeat_function(unsigned long data) | |||
74 | break; | 74 | break; |
75 | } | 75 | } |
76 | 76 | ||
77 | __led_set_brightness(led_cdev, brightness); | 77 | led_set_brightness_async(led_cdev, brightness); |
78 | mod_timer(&heartbeat_data->timer, jiffies + delay); | 78 | mod_timer(&heartbeat_data->timer, jiffies + delay); |
79 | } | 79 | } |
80 | 80 | ||
diff --git a/drivers/leds/trigger/ledtrig-oneshot.c b/drivers/leds/trigger/ledtrig-oneshot.c index cb4c7466692a..fbd02cdc3ad7 100644 --- a/drivers/leds/trigger/ledtrig-oneshot.c +++ b/drivers/leds/trigger/ledtrig-oneshot.c | |||
@@ -63,9 +63,9 @@ static ssize_t led_invert_store(struct device *dev, | |||
63 | oneshot_data->invert = !!state; | 63 | oneshot_data->invert = !!state; |
64 | 64 | ||
65 | if (oneshot_data->invert) | 65 | if (oneshot_data->invert) |
66 | __led_set_brightness(led_cdev, LED_FULL); | 66 | led_set_brightness_async(led_cdev, LED_FULL); |
67 | else | 67 | else |
68 | __led_set_brightness(led_cdev, LED_OFF); | 68 | led_set_brightness_async(led_cdev, LED_OFF); |
69 | 69 | ||
70 | return size; | 70 | return size; |
71 | } | 71 | } |
diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c index e5abc00bb00c..3c34de404d18 100644 --- a/drivers/leds/trigger/ledtrig-transient.c +++ b/drivers/leds/trigger/ledtrig-transient.c | |||
@@ -41,7 +41,7 @@ static void transient_timer_function(unsigned long data) | |||
41 | struct transient_trig_data *transient_data = led_cdev->trigger_data; | 41 | struct transient_trig_data *transient_data = led_cdev->trigger_data; |
42 | 42 | ||
43 | transient_data->activate = 0; | 43 | transient_data->activate = 0; |
44 | __led_set_brightness(led_cdev, transient_data->restore_state); | 44 | led_set_brightness_async(led_cdev, transient_data->restore_state); |
45 | } | 45 | } |
46 | 46 | ||
47 | static ssize_t transient_activate_show(struct device *dev, | 47 | static ssize_t transient_activate_show(struct device *dev, |
@@ -72,7 +72,8 @@ static ssize_t transient_activate_store(struct device *dev, | |||
72 | if (state == 0 && transient_data->activate == 1) { | 72 | if (state == 0 && transient_data->activate == 1) { |
73 | del_timer(&transient_data->timer); | 73 | del_timer(&transient_data->timer); |
74 | transient_data->activate = state; | 74 | transient_data->activate = state; |
75 | __led_set_brightness(led_cdev, transient_data->restore_state); | 75 | led_set_brightness_async(led_cdev, |
76 | transient_data->restore_state); | ||
76 | return size; | 77 | return size; |
77 | } | 78 | } |
78 | 79 | ||
@@ -80,7 +81,7 @@ static ssize_t transient_activate_store(struct device *dev, | |||
80 | if (state == 1 && transient_data->activate == 0 && | 81 | if (state == 1 && transient_data->activate == 0 && |
81 | transient_data->duration != 0) { | 82 | transient_data->duration != 0) { |
82 | transient_data->activate = state; | 83 | transient_data->activate = state; |
83 | __led_set_brightness(led_cdev, transient_data->state); | 84 | led_set_brightness_async(led_cdev, transient_data->state); |
84 | transient_data->restore_state = | 85 | transient_data->restore_state = |
85 | (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL; | 86 | (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL; |
86 | mod_timer(&transient_data->timer, | 87 | mod_timer(&transient_data->timer, |
@@ -203,7 +204,8 @@ static void transient_trig_deactivate(struct led_classdev *led_cdev) | |||
203 | 204 | ||
204 | if (led_cdev->activated) { | 205 | if (led_cdev->activated) { |
205 | del_timer_sync(&transient_data->timer); | 206 | del_timer_sync(&transient_data->timer); |
206 | __led_set_brightness(led_cdev, transient_data->restore_state); | 207 | led_set_brightness_async(led_cdev, |
208 | transient_data->restore_state); | ||
207 | device_remove_file(led_cdev->dev, &dev_attr_activate); | 209 | device_remove_file(led_cdev->dev, &dev_attr_activate); |
208 | device_remove_file(led_cdev->dev, &dev_attr_duration); | 210 | device_remove_file(led_cdev->dev, &dev_attr_duration); |
209 | device_remove_file(led_cdev->dev, &dev_attr_state); | 211 | device_remove_file(led_cdev->dev, &dev_attr_state); |