projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WorkStruct: make allyesconfig
[deliverable/linux.git]
/
drivers
/
input
/
keyboard
/
sunkbd.c
diff --git
a/drivers/input/keyboard/sunkbd.c
b/drivers/input/keyboard/sunkbd.c
index cac4781103c3ed1cb45a31d22bc0486aa5492e02..6cd887c5eb0a1082560d61172e1dc9bef1b7f0e9 100644
(file)
--- a/
drivers/input/keyboard/sunkbd.c
+++ b/
drivers/input/keyboard/sunkbd.c
@@
-208,9
+208,9
@@
static int sunkbd_initialize(struct sunkbd *sunkbd)
* were in.
*/
* were in.
*/
-static void sunkbd_reinit(
void *data
)
+static void sunkbd_reinit(
struct work_struct *work
)
{
{
- struct sunkbd *sunkbd =
data
;
+ struct sunkbd *sunkbd =
container_of(work, struct sunkbd, tq)
;
wait_event_interruptible_timeout(sunkbd->wait, sunkbd->reset >= 0, HZ);
wait_event_interruptible_timeout(sunkbd->wait, sunkbd->reset >= 0, HZ);
@@
-248,7
+248,7
@@
static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
sunkbd->serio = serio;
sunkbd->dev = input_dev;
init_waitqueue_head(&sunkbd->wait);
sunkbd->serio = serio;
sunkbd->dev = input_dev;
init_waitqueue_head(&sunkbd->wait);
- INIT_WORK(&sunkbd->tq, sunkbd_reinit
, sunkbd
);
+ INIT_WORK(&sunkbd->tq, sunkbd_reinit);
snprintf(sunkbd->phys, sizeof(sunkbd->phys), "%s/input0", serio->phys);
serio_set_drvdata(serio, sunkbd);
snprintf(sunkbd->phys, sizeof(sunkbd->phys), "%s/input0", serio->phys);
serio_set_drvdata(serio, sunkbd);
This page took
0.025085 seconds
and
5
git commands to generate.