iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: atkbd - semaphore to mutex conversion

Browse Source 
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Ingo Molnar
2006-02-19 00:22:18 -05:00
committed by Dmitry Torokhov
parent c14471dc2e
commit 33d3f07ae1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/input/keyboard/atkbd.c
View File

@@ -27,6 +27,7 @@
#include <linux/serio.h> #include <linux/serio.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/libps2.h> #include <linux/libps2.h>
#include <linux/mutex.h>
#define DRIVER_DESC "AT and PS/2 keyboard driver" #define DRIVER_DESC "AT and PS/2 keyboard driver"
@@ -216,7 +217,7 @@ struct atkbd {
unsigned long time; unsigned long time;
struct work_struct event_work; struct work_struct event_work;
struct semaphore event_sem; struct mutex event_mutex;
unsigned long event_mask; unsigned long event_mask;
}; };
@@ -449,7 +450,7 @@ static void atkbd_event_work(void *data)
unsigned char param[2]; unsigned char param[2];
int i, j; int i, j;
down(&atkbd->event_sem); mutex_lock(&atkbd->event_mutex);
if (test_and_clear_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask)) { if (test_and_clear_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask)) {
param[0] = (test_bit(LED_SCROLLL, dev->led) ? 1 : 0) param[0] = (test_bit(LED_SCROLLL, dev->led) ? 1 : 0)
@@ -480,7 +481,7 @@ static void atkbd_event_work(void *data)
ps2_command(&atkbd->ps2dev, param, ATKBD_CMD_SETREP); ps2_command(&atkbd->ps2dev, param, ATKBD_CMD_SETREP);
} }
up(&atkbd->event_sem); mutex_unlock(&atkbd->event_mutex);
} }
/* /*
@@ -846,7 +847,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
atkbd->dev = dev; atkbd->dev = dev;
ps2_init(&atkbd->ps2dev, serio); ps2_init(&atkbd->ps2dev, serio);
INIT_WORK(&atkbd->event_work, atkbd_event_work, atkbd); INIT_WORK(&atkbd->event_work, atkbd_event_work, atkbd);
init_MUTEX(&atkbd->event_sem); mutex_init(&atkbd->event_mutex);
switch (serio->id.type) { switch (serio->id.type) {