diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-01-29 15:39:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 12:37:30 -0400 |
commit | 3142788b7967ccfd2f1813ee9e11aeb1e1cf7de2 (patch) | |
tree | 292a6e3a21e237789c91a8d0ccd021321990a265 /drivers/base | |
parent | 190e8370b8033f746db5289e9324174564a6f5a7 (diff) |
drivers/base: Convert dev->sem to mutex
The semaphore is semantically a mutex. Convert it to a real mutex and
fix up a few places where code was relying on semaphore.h to be included
by device.h, as well as the users of the trylock function, as that value
is now reversed.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index e11c8c3e7416..cf507a7d200c 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/notifier.h> | 20 | #include <linux/notifier.h> |
21 | #include <linux/genhd.h> | 21 | #include <linux/genhd.h> |
22 | #include <linux/kallsyms.h> | 22 | #include <linux/kallsyms.h> |
23 | #include <linux/semaphore.h> | ||
24 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
25 | #include <linux/async.h> | 24 | #include <linux/async.h> |
26 | 25 | ||
@@ -559,7 +558,7 @@ void device_initialize(struct device *dev) | |||
559 | dev->kobj.kset = devices_kset; | 558 | dev->kobj.kset = devices_kset; |
560 | kobject_init(&dev->kobj, &device_ktype); | 559 | kobject_init(&dev->kobj, &device_ktype); |
561 | INIT_LIST_HEAD(&dev->dma_pools); | 560 | INIT_LIST_HEAD(&dev->dma_pools); |
562 | init_MUTEX(&dev->sem); | 561 | mutex_init(&dev->mutex); |
563 | spin_lock_init(&dev->devres_lock); | 562 | spin_lock_init(&dev->devres_lock); |
564 | INIT_LIST_HEAD(&dev->devres_head); | 563 | INIT_LIST_HEAD(&dev->devres_head); |
565 | device_pm_init(dev); | 564 | device_pm_init(dev); |