aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc/led.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/parisc/led.c')
-rw-r--r--drivers/parisc/led.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 8dac2ba82bb..6818c10c0c4 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
68static struct workqueue_struct *led_wq; 68static struct workqueue_struct *led_wq;
69static void led_work_func(void *); 69static void led_work_func(struct work_struct *);
70static DECLARE_WORK(led_task, led_work_func, NULL); 70static 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
446static void led_work_func (void *unused) 446static 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;