diff options
Diffstat (limited to 'drivers/parisc/led.c')
-rw-r--r-- | drivers/parisc/led.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 9a731c101d1..d190c05d87e 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c | |||
@@ -66,8 +66,8 @@ static char lcd_text_default[32] __read_mostly; | |||
66 | 66 | ||
67 | 67 | ||
68 | static struct workqueue_struct *led_wq; | 68 | static struct workqueue_struct *led_wq; |
69 | static void led_work_func(void *); | 69 | static void led_work_func(struct work_struct *); |
70 | static DECLARE_WORK(led_task, led_work_func, NULL); | 70 | static DECLARE_DELAYED_WORK(led_task, led_work_func); |
71 | 71 | ||
72 | #if 0 | 72 | #if 0 |
73 | #define DPRINTK(x) printk x | 73 | #define DPRINTK(x) printk x |
@@ -136,7 +136,7 @@ static int start_task(void) | |||
136 | 136 | ||
137 | /* Create the work queue and queue the LED task */ | 137 | /* Create the work queue and queue the LED task */ |
138 | led_wq = create_singlethread_workqueue("led_wq"); | 138 | led_wq = create_singlethread_workqueue("led_wq"); |
139 | queue_work(led_wq, &led_task); | 139 | queue_delayed_work(led_wq, &led_task, 0); |
140 | 140 | ||
141 | return 0; | 141 | return 0; |
142 | } | 142 | } |
@@ -441,7 +441,7 @@ static __inline__ int led_get_diskio_activity(void) | |||
441 | 441 | ||
442 | #define LED_UPDATE_INTERVAL (1 + (HZ*19/1000)) | 442 | #define LED_UPDATE_INTERVAL (1 + (HZ*19/1000)) |
443 | 443 | ||
444 | static void led_work_func (void *unused) | 444 | static void led_work_func (struct work_struct *unused) |
445 | { | 445 | { |
446 | static unsigned long last_jiffies; | 446 | static unsigned long last_jiffies; |
447 | static unsigned long count_HZ; /* counter in range 0..HZ */ | 447 | static unsigned long count_HZ; /* counter in range 0..HZ */ |
@@ -588,7 +588,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d | |||
588 | 588 | ||
589 | /* Ensure the work is queued */ | 589 | /* Ensure the work is queued */ |
590 | if (led_wq) { | 590 | if (led_wq) { |
591 | queue_work(led_wq, &led_task); | 591 | queue_delayed_work(led_wq, &led_task, 0); |
592 | } | 592 | } |
593 | 593 | ||
594 | return 0; | 594 | return 0; |
@@ -629,7 +629,7 @@ void __init register_led_regions(void) | |||
629 | ** avoid a race condition while writing the CMD/DATA register pair. | 629 | ** avoid a race condition while writing the CMD/DATA register pair. |
630 | ** | 630 | ** |
631 | */ | 631 | */ |
632 | int lcd_print( char *str ) | 632 | int lcd_print( const char *str ) |
633 | { | 633 | { |
634 | int i; | 634 | int i; |
635 | 635 | ||
@@ -658,7 +658,7 @@ int lcd_print( char *str ) | |||
658 | 658 | ||
659 | /* re-queue the work */ | 659 | /* re-queue the work */ |
660 | if (led_wq) { | 660 | if (led_wq) { |
661 | queue_work(led_wq, &led_task); | 661 | queue_delayed_work(led_wq, &led_task, 0); |
662 | } | 662 | } |
663 | 663 | ||
664 | return lcd_info.lcd_width; | 664 | return lcd_info.lcd_width; |