diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-31 21:06:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-31 21:16:59 -0800 |
| commit | aebd636bd60e2dda0ebc907dd5f7f4a45174411c (patch) | |
| tree | ce5ae0c890149296e70545fccbb11c4799c4e39c /include/linux/input.h | |
| parent | f06e6a52ca3dbe927f58653b1e90cbb53f5ceb55 (diff) | |
| download | linux-aebd636bd60e2dda0ebc907dd5f7f4a45174411c.tar.gz linux-aebd636bd60e2dda0ebc907dd5f7f4a45174411c.tar.bz2 linux-aebd636bd60e2dda0ebc907dd5f7f4a45174411c.zip | |
Input: switch completely over to the new versions of get/setkeycode
All users of old style get/setkeycode methids have been converted so
it is time to retire them.
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index e428382ca28a..056ae8a5bd9b 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -1154,8 +1154,6 @@ struct ff_effect { * sparse keymaps. If not supplied default mechanism will be used. * The method is being called while holding event_lock and thus must * not sleep - * @getkeycode_new: transition method - * @setkeycode_new: transition method * @ff: force feedback structure associated with the device if device * supports force feedback effects * @repeat_key: stores key code of the last key pressed; used to implement @@ -1234,14 +1232,10 @@ struct input_dev { void *keycode; int (*setkeycode)(struct input_dev *dev, - unsigned int scancode, unsigned int keycode); + const struct input_keymap_entry *ke, + unsigned int *old_keycode); int (*getkeycode)(struct input_dev *dev, - unsigned int scancode, unsigned int *keycode); - int (*setkeycode_new)(struct input_dev *dev, - const struct input_keymap_entry *ke, - unsigned int *old_keycode); - int (*getkeycode_new)(struct input_dev *dev, - struct input_keymap_entry *ke); + struct input_keymap_entry *ke); struct ff_device *ff; |