diff options
author | Andres Salomon <dilinger@queued.net> | 2008-09-16 12:30:33 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-09-21 18:28:36 -0400 |
commit | 8bf020ee9650899a45295d0c3a0744d4d1bf2801 (patch) | |
tree | 8662aec5256de22eb43438facce3976f776a3559 /drivers/input/mouse/psmouse.h | |
parent | a48cf5f3e5aef5ecb667f954ae1ae2a9b875465f (diff) |
Input: psmouse - add psmouse_queue_work() for ps/2 extension to make use of
psmouse_queue_work is passed a delayed_work struct, and queues up the work
with kpsmouse_wq. Since we're dealing with delayed_work stuff, this
also switches resync_work to a delayed_work struct as well, and makes
use of psmouse_queue_work when doing a resync within psmouse-base.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/psmouse.h')
-rw-r--r-- | drivers/input/mouse/psmouse.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index ed40415f0067..48e0112fb264 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h | |||
@@ -39,7 +39,7 @@ struct psmouse { | |||
39 | void *private; | 39 | void *private; |
40 | struct input_dev *dev; | 40 | struct input_dev *dev; |
41 | struct ps2dev ps2dev; | 41 | struct ps2dev ps2dev; |
42 | struct work_struct resync_work; | 42 | struct delayed_work resync_work; |
43 | char *vendor; | 43 | char *vendor; |
44 | char *name; | 44 | char *name; |
45 | unsigned char packet[8]; | 45 | unsigned char packet[8]; |
@@ -92,6 +92,8 @@ enum psmouse_type { | |||
92 | PSMOUSE_AUTO /* This one should always be last */ | 92 | PSMOUSE_AUTO /* This one should always be last */ |
93 | }; | 93 | }; |
94 | 94 | ||
95 | void psmouse_queue_work(struct psmouse *psmouse, struct delayed_work *work, | ||
96 | unsigned long delay); | ||
95 | int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command); | 97 | int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command); |
96 | int psmouse_reset(struct psmouse *psmouse); | 98 | int psmouse_reset(struct psmouse *psmouse); |
97 | void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state); | 99 | void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state); |