diff options
author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2006-04-03 04:04:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-22 14:22:50 -0400 |
commit | abd52a13206e02537ca1dc08fc5438c7d27bdbf1 (patch) | |
tree | efe0ff89898aad10600d392ac727dcea9e7af322 /drivers/w1/w1.h | |
parent | 46e07f6e5eb0e465e086b8f485f4238bd453e3e9 (diff) |
[PATCH] w1: Use mutexes instead of semaphores.
Use mutexes instead of semaphores.
Patch tested on x86_64 and i386 with test bus master driver.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/w1/w1.h')
-rw-r--r-- | drivers/w1/w1.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h index e8c96e6e7418..6caccfc97cdf 100644 --- a/drivers/w1/w1.h +++ b/drivers/w1/w1.h | |||
@@ -41,8 +41,7 @@ struct w1_reg_num | |||
41 | 41 | ||
42 | #include <linux/completion.h> | 42 | #include <linux/completion.h> |
43 | #include <linux/device.h> | 43 | #include <linux/device.h> |
44 | 44 | #include <linux/mutex.h> | |
45 | #include <asm/semaphore.h> | ||
46 | 45 | ||
47 | #include "w1_family.h" | 46 | #include "w1_family.h" |
48 | 47 | ||
@@ -171,7 +170,7 @@ struct w1_master | |||
171 | long flags; | 170 | long flags; |
172 | 171 | ||
173 | struct task_struct *thread; | 172 | struct task_struct *thread; |
174 | struct semaphore mutex; | 173 | struct mutex mutex; |
175 | 174 | ||
176 | struct device_driver *driver; | 175 | struct device_driver *driver; |
177 | struct device dev; | 176 | struct device dev; |