redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

sonypi: use mutex instead of semaphore

Browse source 
the Sony Programmable I/O Control driver uses a semaphore as
mutex. use the mutex API instead of the (binary) semaphore

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Acked-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Matthias Kaehlcke 2007-04-24 22:02:35 +02:00 committed by Len Brown
parent 1b20d34406
commit c6c60106b9
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/char/sonypi.c
View file

@ -484,7 +484,7 @@ static struct sonypi_device {
u16 evtype_offset; u16 evtype_offset;
int camera_power; int camera_power;
int bluetooth_power; int bluetooth_power;
struct semaphore lock; struct mutex lock;
struct kfifo *fifo; struct kfifo *fifo;
spinlock_t fifo_lock; spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list; wait_queue_head_t fifo_proc_list;
@ -891,7 +891,7 @@ int sonypi_camera_command(int command, u8 value)
if (!camera) if (!camera)
return -EIO; return -EIO;
down(&sonypi_device.lock); mutex_lock(&sonypi_device.lock);
switch (command) { switch (command) {
case SONYPI_COMMAND_SETCAMERA: case SONYPI_COMMAND_SETCAMERA:
@ -926,7 +926,7 @@ int sonypi_camera_command(int command, u8 value)
command); command);
break; break;
} }
up(&sonypi_device.lock); mutex_unlock(&sonypi_device.lock);
return 0; return 0;
} }
@ -945,20 +945,20 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
static int sonypi_misc_release(struct inode *inode, struct file *file) static int sonypi_misc_release(struct inode *inode, struct file *file)
{ {
sonypi_misc_fasync(-1, file, 0); sonypi_misc_fasync(-1, file, 0);
down(&sonypi_device.lock); mutex_lock(&sonypi_device.lock);
sonypi_device.open_count--; sonypi_device.open_count--;
up(&sonypi_device.lock); mutex_unlock(&sonypi_device.lock);
return 0; return 0;
} }
static int sonypi_misc_open(struct inode *inode, struct file *file) static int sonypi_misc_open(struct inode *inode, struct file *file)
{ {
down(&sonypi_device.lock); mutex_lock(&sonypi_device.lock);
/* Flush input queue on first open */ /* Flush input queue on first open */
if (!sonypi_device.open_count) if (!sonypi_device.open_count)
kfifo_reset(sonypi_device.fifo); kfifo_reset(sonypi_device.fifo);
sonypi_device.open_count++; sonypi_device.open_count++;
up(&sonypi_device.lock); mutex_unlock(&sonypi_device.lock);
return 0; return 0;
} }
@ -1008,7 +1008,7 @@ static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
u8 val8; u8 val8;
u16 val16; u16 val16;
down(&sonypi_device.lock); mutex_lock(&sonypi_device.lock);
switch (cmd) { switch (cmd) {
case SONYPI_IOCGBRT: case SONYPI_IOCGBRT:
if (sonypi_ec_read(SONYPI_LCD_LIGHT, &val8)) { if (sonypi_ec_read(SONYPI_LCD_LIGHT, &val8)) {
@ -1108,7 +1108,7 @@ static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
default: default:
ret = -EINVAL; ret = -EINVAL;
} }
up(&sonypi_device.lock); mutex_unlock(&sonypi_device.lock);
return ret; return ret;
} }
@ -1363,7 +1363,7 @@ static int __devinit sonypi_probe(struct platform_device *dev)
} }
init_waitqueue_head(&sonypi_device.fifo_proc_list); init_waitqueue_head(&sonypi_device.fifo_proc_list);
init_MUTEX(&sonypi_device.lock); mutex_init(&sonypi_device.lock);
sonypi_device.bluetooth_power = -1; sonypi_device.bluetooth_power = -1;
if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,