diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 21:13:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 21:16:12 -0400 |
commit | a3d52136ee8f7399859f9a0824470fd49b1d1a00 (patch) | |
tree | ac0fd3d1efc356029cbbc5e413f778f7231cd909 /drivers/input/keyboard/atkbd.c | |
parent | 5b339915762d30b21995aa7263e74081f2f1110a (diff) | |
parent | 84767d00a8fd54dd97866561f6e2ee246c8e1cdc (diff) |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (65 commits)
Input: gpio_keys - add support for switches (EV_SW)
Input: cobalt_btns - convert to use polldev library
Input: add skeleton for simple polled devices
Input: update some documentation
Input: wistron - fix typo in keymap for Acer TM610
Input: add input_set_capability() helper
Input: i8042 - add Fujitsu touchscreen/touchpad PNP IDs
Input: i8042 - add Panasonic CF-29 to nomux list
Input: lifebook - split into 2 devices
Input: lifebook - add signature of Panasonic CF-29
Input: lifebook - activate 6-byte protocol on select models
Input: lifebook - work properly on Panasonic CF-18
Input: cobalt buttons - separate device and driver registration
Input: ati_remote - make button repeat sensitivity configurable
Input: pxa27x - do not use deprecated SA_INTERRUPT flag
Input: ucb1400 - make delays configurable
Input: misc devices - switch to using input_dev->dev.parent
Input: joysticks - switch to using input_dev->dev.parent
Input: touchscreens - switch to using input_dev->dev.parent
Input: mice - switch to using input_dev->dev.parent
...
Fixed up conflicts with core device model removal of "struct subsystem" manually.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/input/keyboard/atkbd.c')
-rw-r--r-- | drivers/input/keyboard/atkbd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 663877076bc7..be1fe46cd308 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -586,7 +586,7 @@ static void atkbd_event_work(struct work_struct *work) | |||
586 | 586 | ||
587 | static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) | 587 | static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) |
588 | { | 588 | { |
589 | struct atkbd *atkbd = dev->private; | 589 | struct atkbd *atkbd = input_get_drvdata(dev); |
590 | 590 | ||
591 | if (!atkbd->write) | 591 | if (!atkbd->write) |
592 | return -1; | 592 | return -1; |
@@ -883,8 +883,9 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd) | |||
883 | input_dev->id.product = atkbd->translated ? 1 : atkbd->set; | 883 | input_dev->id.product = atkbd->translated ? 1 : atkbd->set; |
884 | input_dev->id.version = atkbd->id; | 884 | input_dev->id.version = atkbd->id; |
885 | input_dev->event = atkbd_event; | 885 | input_dev->event = atkbd_event; |
886 | input_dev->private = atkbd; | 886 | input_dev->dev.parent = &atkbd->ps2dev.serio->dev; |
887 | input_dev->cdev.dev = &atkbd->ps2dev.serio->dev; | 887 | |
888 | input_set_drvdata(input_dev, atkbd); | ||
888 | 889 | ||
889 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_MSC); | 890 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_MSC); |
890 | 891 | ||