aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hiddev.h
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-06-26 18:04:24 -0400
committerJiri Kosina <jkosina@suse.cz>2008-10-14 17:50:56 -0400
commit93c10132a7ac160df3175b53f7ee857625412165 (patch)
tree64ea194ddd7791d44394bb2a918921a2906fe1ee /include/linux/hiddev.h
parentfea6f1833b5bbff7066bcde1fa1141c9717bbad2 (diff)
HID: move connect quirks
Move connecting from usbhid to the hid layer and fix also hidp in that manner. This removes all the ignore/force hidinput/hiddev connecting quirks. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/hiddev.h')
-rw-r--r--include/linux/hiddev.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h
index a416b904ba90..6ae77b3468f9 100644
--- a/include/linux/hiddev.h
+++ b/include/linux/hiddev.h
@@ -217,7 +217,7 @@ struct hid_field;
217struct hid_report; 217struct hid_report;
218 218
219#ifdef CONFIG_USB_HIDDEV 219#ifdef CONFIG_USB_HIDDEV
220int hiddev_connect(struct hid_device *); 220int hiddev_connect(struct hid_device *hid, unsigned int force);
221void hiddev_disconnect(struct hid_device *); 221void hiddev_disconnect(struct hid_device *);
222void hiddev_hid_event(struct hid_device *hid, struct hid_field *field, 222void hiddev_hid_event(struct hid_device *hid, struct hid_field *field,
223 struct hid_usage *usage, __s32 value); 223 struct hid_usage *usage, __s32 value);
@@ -225,7 +225,9 @@ void hiddev_report_event(struct hid_device *hid, struct hid_report *report);
225int __init hiddev_init(void); 225int __init hiddev_init(void);
226void hiddev_exit(void); 226void hiddev_exit(void);
227#else 227#else
228static inline int hiddev_connect(struct hid_device *hid) { return -1; } 228static inline int hiddev_connect(struct hid_device *hid,
229 unsigned int force)
230{ return -1; }
229static inline void hiddev_disconnect(struct hid_device *hid) { } 231static inline void hiddev_disconnect(struct hid_device *hid) { }
230static inline void hiddev_hid_event(struct hid_device *hid, struct hid_field *field, 232static inline void hiddev_hid_event(struct hid_device *hid, struct hid_field *field,
231 struct hid_usage *usage, __s32 value) { } 233 struct hid_usage *usage, __s32 value) { }