lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sysdev: use mutex instead of semaphore

Browse Source 
The sysdev code use a semaphore as mutex.  Use the mutex API instead of the
(binary) semaphore.

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Matthias Kaehlcke
2007-05-23 14:19:42 -07:00
committed by Greg Kroah-Hartman
parent 80f03e349f
commit 9f3f776bd9
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/base/sys.c
View File

@@ -21,7 +21,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/device.h> #include <linux/device.h>
#include <asm/semaphore.h> #include <linux/mutex.h>
#include "base.h" #include "base.h"
@@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(sysdev_class_unregister);
static LIST_HEAD(sysdev_drivers); static LIST_HEAD(sysdev_drivers);
static DECLARE_MUTEX(sysdev_drivers_lock); static DEFINE_MUTEX(sysdev_drivers_lock);
/** /**
* sysdev_driver_register - Register auxillary driver * sysdev_driver_register - Register auxillary driver
@@ -172,7 +172,7 @@ static DECLARE_MUTEX(sysdev_drivers_lock);
int sysdev_driver_register(struct sysdev_class * cls, int sysdev_driver_register(struct sysdev_class * cls,
struct sysdev_driver * drv) struct sysdev_driver * drv)
{ {
down(&sysdev_drivers_lock); mutex_lock(&sysdev_drivers_lock);
if (cls && kset_get(&cls->kset)) { if (cls && kset_get(&cls->kset)) {
list_add_tail(&drv->entry, &cls->drivers); list_add_tail(&drv->entry, &cls->drivers);
@@ -184,7 +184,7 @@ int sysdev_driver_register(struct sysdev_class * cls,
} }
} else } else
list_add_tail(&drv->entry, &sysdev_drivers); list_add_tail(&drv->entry, &sysdev_drivers);
up(&sysdev_drivers_lock); mutex_unlock(&sysdev_drivers_lock);
return 0; return 0;
} }
@@ -197,7 +197,7 @@ int sysdev_driver_register(struct sysdev_class * cls,
void sysdev_driver_unregister(struct sysdev_class * cls, void sysdev_driver_unregister(struct sysdev_class * cls,
struct sysdev_driver * drv) struct sysdev_driver * drv)
{ {
down(&sysdev_drivers_lock); mutex_lock(&sysdev_drivers_lock);
list_del_init(&drv->entry); list_del_init(&drv->entry);
if (cls) { if (cls) {
if (drv->remove) { if (drv->remove) {
@@ -207,7 +207,7 @@ void sysdev_driver_unregister(struct sysdev_class * cls,
} }
kset_put(&cls->kset); kset_put(&cls->kset);
} }
up(&sysdev_drivers_lock); mutex_unlock(&sysdev_drivers_lock);
} }
EXPORT_SYMBOL_GPL(sysdev_driver_register); EXPORT_SYMBOL_GPL(sysdev_driver_register);
@@ -246,7 +246,7 @@ int sysdev_register(struct sys_device * sysdev)
if (!error) { if (!error) {
struct sysdev_driver * drv; struct sysdev_driver * drv;
down(&sysdev_drivers_lock); mutex_lock(&sysdev_drivers_lock);
/* Generic notification is implicit, because it's that /* Generic notification is implicit, because it's that
* code that should have called us. * code that should have called us.
*/ */
@@ -262,7 +262,7 @@ int sysdev_register(struct sys_device * sysdev)
if (drv->add) if (drv->add)
drv->add(sysdev); drv->add(sysdev);
} }
up(&sysdev_drivers_lock); mutex_unlock(&sysdev_drivers_lock);
} }
return error; return error;
} }
@@ -271,7 +271,7 @@ void sysdev_unregister(struct sys_device * sysdev)
{ {
struct sysdev_driver * drv; struct sysdev_driver * drv;
down(&sysdev_drivers_lock); mutex_lock(&sysdev_drivers_lock);
list_for_each_entry(drv, &sysdev_drivers, entry) { list_for_each_entry(drv, &sysdev_drivers, entry) {
if (drv->remove) if (drv->remove)
drv->remove(sysdev); drv->remove(sysdev);
@@ -281,7 +281,7 @@ void sysdev_unregister(struct sys_device * sysdev)
if (drv->remove) if (drv->remove)
drv->remove(sysdev); drv->remove(sysdev);
} }
up(&sysdev_drivers_lock); mutex_unlock(&sysdev_drivers_lock);
kobject_unregister(&sysdev->kobj); kobject_unregister(&sysdev->kobj);
} }
@@ -308,7 +308,7 @@ void sysdev_shutdown(void)
pr_debug("Shutting Down System Devices\n"); pr_debug("Shutting Down System Devices\n");
down(&sysdev_drivers_lock); mutex_lock(&sysdev_drivers_lock);
list_for_each_entry_reverse(cls, &system_subsys.list, list_for_each_entry_reverse(cls, &system_subsys.list,
kset.kobj.entry) { kset.kobj.entry) {
struct sys_device * sysdev; struct sys_device * sysdev;
@@ -337,7 +337,7 @@ void sysdev_shutdown(void)
cls->shutdown(sysdev); cls->shutdown(sysdev);
} }
} }
up(&sysdev_drivers_lock); mutex_unlock(&sysdev_drivers_lock);
} }
static void __sysdev_resume(struct sys_device *dev) static void __sysdev_resume(struct sys_device *dev)