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

[PATCH] sem2mutex: drivers/mtd/

Browse Source 
Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ingo Molnar
2006-03-31 02:29:41 -08:00
committed by Linus Torvalds
parent 040d79f906
commit 48b192686d
8 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/mtd/mtdcore.c
View File

@ -27,7 +27,7 @@
/* These are exported solely for the purpose of mtd_blkdevs.c. You
should not use them for _anything_ else */
DECLARE_MUTEX(mtd_table_mutex);
DEFINE_MUTEX(mtd_table_mutex);
struct mtd_info *mtd_table[MAX_MTD_DEVICES];
EXPORT_SYMBOL_GPL(mtd_table_mutex);
@ -49,7 +49,7 @@ int add_mtd_device(struct mtd_info *mtd)
{
int i;
down(&mtd_table_mutex);
mutex_lock(&mtd_table_mutex);
for (i=0; i < MAX_MTD_DEVICES; i++)
if (!mtd_table[i]) {
@ -67,7 +67,7 @@ int add_mtd_device(struct mtd_info *mtd)
not->add(mtd);
}
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
/* We _know_ we aren't being removed, because
our caller is still holding us here. So none
of this try_ nonsense, and no bitching about it
@ -76,7 +76,7 @@ int add_mtd_device(struct mtd_info *mtd)
return 0;
}
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
return 1;
}
@ -94,7 +94,7 @@ int del_mtd_device (struct mtd_info *mtd)
{
int ret;
down(&mtd_table_mutex);
mutex_lock(&mtd_table_mutex);
if (mtd_table[mtd->index] != mtd) {
ret = -ENODEV;
@ -118,7 +118,7 @@ int del_mtd_device (struct mtd_info *mtd)
ret = 0;
}
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
return ret;
}
@ -135,7 +135,7 @@ void register_mtd_user (struct mtd_notifier *new)
{
int i;
down(&mtd_table_mutex);
mutex_lock(&mtd_table_mutex);
list_add(&new->list, &mtd_notifiers);
@ -145,7 +145,7 @@ void register_mtd_user (struct mtd_notifier *new)
if (mtd_table[i])
new->add(mtd_table[i]);
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
}
/**
@ -162,7 +162,7 @@ int unregister_mtd_user (struct mtd_notifier *old)
{
int i;
down(&mtd_table_mutex);
mutex_lock(&mtd_table_mutex);
module_put(THIS_MODULE);
@ -171,7 +171,7 @@ int unregister_mtd_user (struct mtd_notifier *old)
old->remove(mtd_table[i]);
list_del(&old->list);
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
return 0;
}
@ -193,7 +193,7 @@ struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
struct mtd_info *ret = NULL;
int i;
down(&mtd_table_mutex);
mutex_lock(&mtd_table_mutex);
if (num == -1) {
for (i=0; i< MAX_MTD_DEVICES; i++)
@ -211,7 +211,7 @@ struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
if (ret)
ret->usecount++;
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
return ret;
}
@ -219,9 +219,9 @@ void put_mtd_device(struct mtd_info *mtd)
{
int c;
down(&mtd_table_mutex);
mutex_lock(&mtd_table_mutex);
c = --mtd->usecount;
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
BUG_ON(c < 0);
module_put(mtd->owner);
@ -319,7 +319,7 @@ static int mtd_read_proc (char *page, char **start, off_t off, int count,
int len, l, i;
off_t begin = 0;
down(&mtd_table_mutex);
mutex_lock(&mtd_table_mutex);
len = sprintf(page, "dev: size erasesize name\n");
for (i=0; i< MAX_MTD_DEVICES; i++) {
@ -337,7 +337,7 @@ static int mtd_read_proc (char *page, char **start, off_t off, int count,
*eof = 1;
done:
up(&mtd_table_mutex);
mutex_unlock(&mtd_table_mutex);
if (off >= len+begin)
return 0;
*start = page + (off-begin);