diff options
author | David Fries <david@fries.net> | 2008-10-16 01:04:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:49 -0400 |
commit | 3c52e4e627896b42152cc6ff98216c302932227e (patch) | |
tree | 811992a651418cfcd8a606317e2abae26447b9f9 /drivers/w1/w1.h | |
parent | 01e14d6db9654be005a0a5384090aea2cde39976 (diff) |
W1: w1_process, block or sleep
The w1_process thread's sleeping and termination has been modified.
msleep_interruptible was replaced by schedule_timeout and schedule to
allow for kthread_stop and wake_up_process to interrupt the sleep and the
unbounded sleeping when a bus search is disabled. The W1_MASTER_NEED_EXIT
and flags variable were removed as they were redundant with
kthread_should_stop and kthread_stop. If w1_process is sleeping,
requesting a search will immediately wake it up rather than waiting for
the end of msleep_interruptible previously.
Signed-off-by: David Fries <david@fries.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1/w1.h')
-rw-r--r-- | drivers/w1/w1.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h index 13e0ea880bf8..34ee01e008ad 100644 --- a/drivers/w1/w1.h +++ b/drivers/w1/w1.h | |||
@@ -149,8 +149,6 @@ struct w1_bus_master | |||
149 | u8, w1_slave_found_callback); | 149 | u8, w1_slave_found_callback); |
150 | }; | 150 | }; |
151 | 151 | ||
152 | #define W1_MASTER_NEED_EXIT 0 | ||
153 | |||
154 | struct w1_master | 152 | struct w1_master |
155 | { | 153 | { |
156 | struct list_head w1_master_entry; | 154 | struct list_head w1_master_entry; |
@@ -169,8 +167,6 @@ struct w1_master | |||
169 | void *priv; | 167 | void *priv; |
170 | int priv_size; | 168 | int priv_size; |
171 | 169 | ||
172 | long flags; | ||
173 | |||
174 | struct task_struct *thread; | 170 | struct task_struct *thread; |
175 | struct mutex mutex; | 171 | struct mutex mutex; |
176 | 172 | ||