diff options
author | Jiri Kosina <jkosina@suse.cz> | 2007-01-24 05:54:19 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2007-02-05 04:00:40 -0500 |
commit | 7c379146005d277982acde02da44c773de5e7e5a (patch) | |
tree | 8a1bbbdabd357f11ec84e5e793539863139ffa71 /include | |
parent | c080d89ad91e98fec0e8fc5f448a1ad899bd85c7 (diff) |
HID: API - fix leftovers of hidinput API in USB HID
hidinput_{open,close}() functions do not belong to usbhid, but
to the generic HID layer. Move them, and fix hooks in struct
hid_device, so that now the callbacks are done to transport-specific
_open() functions, but not input_open() functions.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 189460e7b03f..829690d8071e 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -431,8 +431,8 @@ struct hid_device { /* device report descriptor */ | |||
431 | 431 | ||
432 | /* device-specific function pointers */ | 432 | /* device-specific function pointers */ |
433 | int (*hidinput_input_event) (struct input_dev *, unsigned int, unsigned int, int); | 433 | int (*hidinput_input_event) (struct input_dev *, unsigned int, unsigned int, int); |
434 | int (*hidinput_open) (struct input_dev *); | 434 | int (*hid_open) (struct hid_device *); |
435 | void (*hidinput_close) (struct input_dev *); | 435 | void (*hid_close) (struct hid_device *); |
436 | 436 | ||
437 | /* hiddev event handler */ | 437 | /* hiddev event handler */ |
438 | void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field, | 438 | void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field, |