diff options
Diffstat (limited to 'drivers/usb/input/hid.h')
-rw-r--r-- | drivers/usb/input/hid.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h index 29f1613bd08..6d88c0c0b90 100644 --- a/drivers/usb/input/hid.h +++ b/drivers/usb/input/hid.h | |||
@@ -449,11 +449,6 @@ struct hid_device { /* device report descriptor */ | |||
449 | char phys[64]; /* Device physical location */ | 449 | char phys[64]; /* Device physical location */ |
450 | char uniq[64]; /* Device unique identifier (serial #) */ | 450 | char uniq[64]; /* Device unique identifier (serial #) */ |
451 | 451 | ||
452 | void *ff_private; /* Private data for the force-feedback driver */ | ||
453 | void (*ff_exit)(struct hid_device*); /* Called by hid_exit_ff(hid) */ | ||
454 | int (*ff_event)(struct hid_device *hid, struct input_dev *input, | ||
455 | unsigned int type, unsigned int code, int value); | ||
456 | |||
457 | #ifdef CONFIG_USB_HIDINPUT_POWERBOOK | 452 | #ifdef CONFIG_USB_HIDINPUT_POWERBOOK |
458 | unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; | 453 | unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; |
459 | unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; | 454 | unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; |
@@ -540,17 +535,3 @@ static inline int hid_pidff_init(struct hid_device *hid) { return -ENODEV; } | |||
540 | static inline int hid_ff_init(struct hid_device *hid) { return -1; } | 535 | static inline int hid_ff_init(struct hid_device *hid) { return -1; } |
541 | #endif | 536 | #endif |
542 | 537 | ||
543 | static inline void hid_ff_exit(struct hid_device *hid) | ||
544 | { | ||
545 | if (hid->ff_exit) | ||
546 | hid->ff_exit(hid); | ||
547 | } | ||
548 | |||
549 | static inline int hid_ff_event(struct hid_device *hid, struct input_dev *input, | ||
550 | unsigned int type, unsigned int code, int value) | ||
551 | { | ||
552 | if (hid->ff_event) | ||
553 | return hid->ff_event(hid, input, type, code, value); | ||
554 | return -ENOSYS; | ||
555 | } | ||
556 | |||