mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
[SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex
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:
parent
6050afbbb0
commit
7b96dc023a
@ -126,7 +126,7 @@ struct vfc_dev {
|
||||
volatile struct vfc_regs __iomem *regs;
|
||||
struct vfc_regs *phys_regs;
|
||||
unsigned int control_reg;
|
||||
struct semaphore device_lock_sem;
|
||||
struct mutex device_lock_mtx;
|
||||
int instance;
|
||||
int busy;
|
||||
unsigned long which_io;
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include <linux/fs.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/mm.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)
|
||||
{
|
||||
down(&dev->device_lock_sem);
|
||||
mutex_lock(&dev->device_lock_mtx);
|
||||
}
|
||||
|
||||
void vfc_unlock_device(struct vfc_dev *dev)
|
||||
{
|
||||
up(&dev->device_lock_sem);
|
||||
mutex_unlock(&dev->device_lock_mtx);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user