Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex

Browse Source 
Videopix Frame Grabber: Convert the semaphore device_lock_sem to the
mutex API

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matthias Kaehlcke 2007-10-17 19:40:31 -07:00 committed by David S. Miller
parent 6050afbbb0
commit 7b96dc023a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/sbus/char/vfc.h
View File

@ -126,7 +126,7 @@ struct vfc_dev {
volatile struct vfc_regs __iomem *regs; volatile struct vfc_regs __iomem *regs;
struct vfc_regs *phys_regs; struct vfc_regs *phys_regs;
unsigned int control_reg; unsigned int control_reg;
struct semaphore device_lock_sem; struct mutex device_lock_mtx;
int instance; int instance;
int busy; int busy;
unsigned long which_io; unsigned long which_io;

5
drivers/sbus/char/vfc_dev.c
View File

@ -22,6 +22,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/mutex.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/openprom.h> #include <asm/openprom.h>
@ -54,12 +55,12 @@ static unsigned char saa9051_init_array[VFC_SAA9051_NR] = {
void vfc_lock_device(struct vfc_dev *dev) void vfc_lock_device(struct vfc_dev *dev)
{ {
down(&dev->device_lock_sem); mutex_lock(&dev->device_lock_mtx);
} }
void vfc_unlock_device(struct vfc_dev *dev) void vfc_unlock_device(struct vfc_dev *dev)
{ {
up(&dev->device_lock_sem); mutex_unlock(&dev->device_lock_mtx);
} }