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

sa1100fb: convert ctrlr_sem in a mutex

Browse Source 
The semaphore ctrlr_sem is used as a mutex.  Convert it to the mutex API

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthias Kaehlcke 2008-07-23 21:31:16 -07:00 committed by Linus Torvalds
parent b91dbce56a
commit 7951ac91c7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/sa1100fb.c
View File

@ -175,6 +175,7 @@
#include <linux/cpufreq.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/mutex.h>
#include <asm/hardware.h>
#include <asm/io.h>
@ -1108,7 +1109,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
{
u_int old_state;
down(&fbi->ctrlr_sem);
mutex_lock(&fbi->ctrlr_lock);
old_state = fbi->state;
@ -1193,7 +1194,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
}
break;
}
up(&fbi->ctrlr_sem);
mutex_unlock(&fbi->ctrlr_lock);
}
/*
@ -1445,7 +1446,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
init_waitqueue_head(&fbi->ctrlr_wait);
INIT_WORK(&fbi->task, sa1100fb_task);
init_MUTEX(&fbi->ctrlr_sem);
mutex_init(&fbi->ctrlr_lock);
return fbi;
}

2
drivers/video/sa1100fb.h
View File

@ -100,7 +100,7 @@ struct sa1100fb_info {
volatile u_char state;
volatile u_char task_state;
struct semaphore ctrlr_sem;
struct mutex ctrlr_lock;
wait_queue_head_t ctrlr_wait;
struct work_struct task;