diff options
Diffstat (limited to 'drivers/leds/led-class.c')
-rw-r--r-- | drivers/leds/led-class.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 129729d35478..aa29198fca3e 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c | |||
@@ -15,10 +15,10 @@ | |||
15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
18 | #include <linux/timer.h> | ||
18 | #include <linux/err.h> | 19 | #include <linux/err.h> |
19 | #include <linux/ctype.h> | 20 | #include <linux/ctype.h> |
20 | #include <linux/leds.h> | 21 | #include <linux/leds.h> |
21 | #include <linux/workqueue.h> | ||
22 | #include "leds.h" | 22 | #include "leds.h" |
23 | 23 | ||
24 | static struct class *leds_class; | 24 | static struct class *leds_class; |
@@ -97,10 +97,9 @@ static const struct attribute_group *led_groups[] = { | |||
97 | NULL, | 97 | NULL, |
98 | }; | 98 | }; |
99 | 99 | ||
100 | static void led_work_function(struct work_struct *ws) | 100 | static void led_timer_function(unsigned long data) |
101 | { | 101 | { |
102 | struct led_classdev *led_cdev = | 102 | struct led_classdev *led_cdev = (void *)data; |
103 | container_of(ws, struct led_classdev, blink_work.work); | ||
104 | unsigned long brightness; | 103 | unsigned long brightness; |
105 | unsigned long delay; | 104 | unsigned long delay; |
106 | 105 | ||
@@ -144,8 +143,7 @@ static void led_work_function(struct work_struct *ws) | |||
144 | } | 143 | } |
145 | } | 144 | } |
146 | 145 | ||
147 | queue_delayed_work(system_wq, &led_cdev->blink_work, | 146 | mod_timer(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay)); |
148 | msecs_to_jiffies(delay)); | ||
149 | } | 147 | } |
150 | 148 | ||
151 | static void set_brightness_delayed(struct work_struct *ws) | 149 | static void set_brightness_delayed(struct work_struct *ws) |
@@ -233,7 +231,9 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) | |||
233 | 231 | ||
234 | INIT_WORK(&led_cdev->set_brightness_work, set_brightness_delayed); | 232 | INIT_WORK(&led_cdev->set_brightness_work, set_brightness_delayed); |
235 | 233 | ||
236 | INIT_DELAYED_WORK(&led_cdev->blink_work, led_work_function); | 234 | init_timer(&led_cdev->blink_timer); |
235 | led_cdev->blink_timer.function = led_timer_function; | ||
236 | led_cdev->blink_timer.data = (unsigned long)led_cdev; | ||
237 | 237 | ||
238 | #ifdef CONFIG_LEDS_TRIGGERS | 238 | #ifdef CONFIG_LEDS_TRIGGERS |
239 | led_trigger_set_default(led_cdev); | 239 | led_trigger_set_default(led_cdev); |