From: David Howells <dhowells@redhat.com>
To: torvalds@osdl.org, akpm@osdl.org, davem@davemloft.com,
wli@holomorphy.com, matthew@wil.cx
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
dhowells@redhat.com
Subject: [PATCH 1/3] WorkStruct: Fix up some PA-RISC work items
Date: Thu, 07 Dec 2006 15:31:38 +0000 [thread overview]
Message-ID: <20061207153138.28408.94099.stgit@warthog.cambridge.redhat.com> (raw)
Fix up some PA-RISC work items broken by the workstruct reduction.
Signed-Off-By: David Howells <dhowells@redhat.com>
---
drivers/parisc/led.c | 12 ++++++------
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 8dac2ba..6818c10 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -66,8 +66,8 @@ static char lcd_text_default[32] __read
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 @@ #define HEARTBEAT_2ND_RANGE_END (HEART
#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
/* 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;
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 97e9dc0..9228e21 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -82,7 +82,7 @@ #define __getDIAG(dr) ( { \
} )
-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 *dumm
* use schedule_work().
*/
-static DECLARE_WORK(poweroff_work, deferred_poweroff, NULL);
+static DECLARE_WORK(poweroff_work, deferred_poweroff);
static void poweroff(void)
{
next reply other threads:[~2006-12-07 15:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-07 15:31 David Howells [this message]
2006-12-07 15:31 ` [PATCH 2/3] WorkStruct: Add assign_bits() to give an atomic-bitops safe assignment David Howells
2006-12-07 15:31 ` [PATCH 3/3] WorkStruct: Use direct assignment rather than cmpxchg() David Howells
2006-12-07 16:54 ` Andrew Morton
2006-12-07 20:06 ` David Howells
2006-12-07 21:06 ` Andrew Morton
2006-12-07 21:06 ` James Bottomley
2006-12-07 21:16 ` David Howells
2006-12-07 22:11 ` David Miller
2006-12-07 23:42 ` Russell King
2006-12-07 23:58 ` David Howells
2006-12-08 11:14 ` Russell King
2006-12-08 13:57 ` David Howells
2006-12-08 3:42 ` [PATCH 1/3] WorkStruct: Fix up some PA-RISC work items Kyle McMartin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061207153138.28408.94099.stgit@warthog.cambridge.redhat.com \
--to=dhowells@redhat.com \
--cc=akpm@osdl.org \
--cc=davem@davemloft.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=torvalds@osdl.org \
--cc=wli@holomorphy.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox