Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6858f3bf authored by David Howells's avatar David Howells Committed by Kyle McMartin
Browse files

[PATCH] WorkStruct: Fix up some PA-RISC work items 



Fix up some PA-RISC work items broken by the workstruct reduction.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 8535e9df

drivers/parisc/led.c

+6 −6
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ static char lcd_text_default[32] __read_mostly; 




static struct workqueue_struct *led_wq;

static void led_work_func(void *);

static DECLARE_WORK(led_task, led_work_func, NULL);

static void led_work_func(struct work_struct *);

static DECLARE_DELAYED_WORK(led_task, led_work_func);



#if 0

#define DPRINTK(x)	printk x
@@ -136,7 +136,7 @@ static int start_task(void) 


	/* Create the work queue and queue the LED task */

	led_wq = create_singlethread_workqueue("led_wq");	

	queue_work(led_wq, &led_task);

	queue_delayed_work(led_wq, &led_task, 0);



	return 0;

}
@@ -443,7 +443,7 @@ static __inline__ int led_get_diskio_activity(void) 


#define LED_UPDATE_INTERVAL (1 + (HZ*19/1000))



static void led_work_func (void *unused)

static void led_work_func (struct work_struct *unused)

{

	static unsigned long last_jiffies;

	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 


	/* Ensure the work is queued */

	if (led_wq) {

		queue_work(led_wq, &led_task);

		queue_delayed_work(led_wq, &led_task, 0);

	}



	return 0;
@@ -660,7 +660,7 @@ int lcd_print( char *str ) 
	

	/* re-queue the work */

	if (led_wq) {

		queue_work(led_wq, &led_task);

		queue_delayed_work(led_wq, &led_task, 0);

	}



	return lcd_info.lcd_width;

drivers/parisc/power.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
} )





static void deferred_poweroff(void *dummy)

static void deferred_poweroff(struct work_struct *unused)

{

	if (kill_cad_pid(SIGINT, 1)) {

		/* just in case killing init process failed */
@@ -96,7 +96,7 @@ static void deferred_poweroff(void *dummy) 
 * use schedule_work().

 */



static DECLARE_WORK(poweroff_work, deferred_poweroff, NULL);

static DECLARE_WORK(poweroff_work, deferred_poweroff);



static void poweroff(void)

{