diff options
author | David Howells <dhowells@redhat.com> | 2006-12-07 10:31:38 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 00:34:48 -0500 |
commit | 6858f3bf6e856d10a932d2d167d3f34e366042c6 (patch) | |
tree | b71e5a25d6e60c5863fecfb46fe6c6bfd0fd7171 /drivers | |
parent | 8535e9dfd350637b37eb38edeb3eb61060d9c894 (diff) |
[PATCH] WorkStruct: Fix up some PA-RISC work items
Fix up some PA-RISC work items broken by the workstruct reduction.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/parisc/led.c | 12 | ||||
-rw-r--r-- | drivers/parisc/power.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 8dac2ba82bb9..6818c10c0c46 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 | } |
@@ -443,7 +443,7 @@ static __inline__ int led_get_diskio_activity(void) | |||
443 | 443 | ||
444 | #define LED_UPDATE_INTERVAL (1 + (HZ*19/1000)) | 444 | #define LED_UPDATE_INTERVAL (1 + (HZ*19/1000)) |
445 | 445 | ||
446 | static void led_work_func (void *unused) | 446 | static void led_work_func (struct work_struct *unused) |
447 | { | 447 | { |
448 | static unsigned long last_jiffies; | 448 | static unsigned long last_jiffies; |
449 | static unsigned long count_HZ; /* counter in range 0..HZ */ | 449 | static unsigned long count_HZ; /* counter in range 0..HZ */ |
@@ -590,7 +590,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d | |||
590 | 590 | ||
591 | /* Ensure the work is queued */ | 591 | /* Ensure the work is queued */ |
592 | if (led_wq) { | 592 | if (led_wq) { |
593 | queue_work(led_wq, &led_task); | 593 | queue_delayed_work(led_wq, &led_task, 0); |
594 | } | 594 | } |
595 | 595 | ||
596 | return 0; | 596 | return 0; |
@@ -660,7 +660,7 @@ int lcd_print( char *str ) | |||
660 | 660 | ||
661 | /* re-queue the work */ | 661 | /* re-queue the work */ |
662 | if (led_wq) { | 662 | if (led_wq) { |
663 | queue_work(led_wq, &led_task); | 663 | queue_delayed_work(led_wq, &led_task, 0); |
664 | } | 664 | } |
665 | 665 | ||
666 | return lcd_info.lcd_width; | 666 | return lcd_info.lcd_width; |
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c index 97e9dc066f95..9228e210c3bb 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c | |||
@@ -82,7 +82,7 @@ | |||
82 | } ) | 82 | } ) |
83 | 83 | ||
84 | 84 | ||
85 | static void deferred_poweroff(void *dummy) | 85 | static void deferred_poweroff(struct work_struct *unused) |
86 | { | 86 | { |
87 | if (kill_cad_pid(SIGINT, 1)) { | 87 | if (kill_cad_pid(SIGINT, 1)) { |
88 | /* just in case killing init process failed */ | 88 | /* just in case killing init process failed */ |
@@ -96,7 +96,7 @@ static void deferred_poweroff(void *dummy) | |||
96 | * use schedule_work(). | 96 | * use schedule_work(). |
97 | */ | 97 | */ |
98 | 98 | ||
99 | static DECLARE_WORK(poweroff_work, deferred_poweroff, NULL); | 99 | static DECLARE_WORK(poweroff_work, deferred_poweroff); |
100 | 100 | ||
101 | static void poweroff(void) | 101 | static void poweroff(void) |
102 | { | 102 | { |