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/joystick/cobra.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/joystick/cobra.c')
-rw-r--r-- | drivers/input/joystick/cobra.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c index 034ec39c251..d3352a849b8 100644 --- a/drivers/input/joystick/cobra.c +++ b/drivers/input/joystick/cobra.c | |||
@@ -142,7 +142,7 @@ static void cobra_poll(struct gameport *gameport) | |||
142 | 142 | ||
143 | static int cobra_open(struct input_dev *dev) | 143 | static int cobra_open(struct input_dev *dev) |
144 | { | 144 | { |
145 | struct cobra *cobra = dev->private; | 145 | struct cobra *cobra = input_get_drvdata(dev); |
146 | 146 | ||
147 | gameport_start_polling(cobra->gameport); | 147 | gameport_start_polling(cobra->gameport); |
148 | return 0; | 148 | return 0; |
@@ -150,7 +150,7 @@ static int cobra_open(struct input_dev *dev) | |||
150 | 150 | ||
151 | static void cobra_close(struct input_dev *dev) | 151 | static void cobra_close(struct input_dev *dev) |
152 | { | 152 | { |
153 | struct cobra *cobra = dev->private; | 153 | struct cobra *cobra = input_get_drvdata(dev); |
154 | 154 | ||
155 | gameport_stop_polling(cobra->gameport); | 155 | gameport_stop_polling(cobra->gameport); |
156 | } | 156 | } |
@@ -211,8 +211,9 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv) | |||
211 | input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE; | 211 | input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE; |
212 | input_dev->id.product = 0x0008; | 212 | input_dev->id.product = 0x0008; |
213 | input_dev->id.version = 0x0100; | 213 | input_dev->id.version = 0x0100; |
214 | input_dev->cdev.dev = &gameport->dev; | 214 | input_dev->dev.parent = &gameport->dev; |
215 | input_dev->private = cobra; | 215 | |
216 | input_set_drvdata(input_dev, cobra); | ||
216 | 217 | ||
217 | input_dev->open = cobra_open; | 218 | input_dev->open = cobra_open; |
218 | input_dev->close = cobra_close; | 219 | input_dev->close = cobra_close; |