diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-06-25 17:03:55 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 17:50:55 -0400 |
commit | 2b88b803018dbc2e9c68cbcd1739186e0715911a (patch) | |
tree | 346a8af4c1cab58bfd5cd4dbe70ce2eae474e90d /drivers/hid/usbhid/hid-quirks.c | |
parent | 3715ade981d524f9bb3b851a1eb81d3604a873bc (diff) |
HID: remove rdesc quirk support
Remove support for both dynamic and static report descriptor
quirks. There is no longer rdesc code which it would support,
so it's useless.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid/hid-quirks.c')
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index d57a37997f9a..f66d2e43b5d5 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -67,15 +67,6 @@ static const struct hid_blacklist { | |||
67 | { 0, 0 } | 67 | { 0, 0 } |
68 | }; | 68 | }; |
69 | 69 | ||
70 | /* Quirks for devices which require report descriptor fixup go here */ | ||
71 | static const struct hid_rdesc_blacklist { | ||
72 | __u16 idVendor; | ||
73 | __u16 idProduct; | ||
74 | __u32 quirks; | ||
75 | } hid_rdesc_blacklist[] = { | ||
76 | { 0, 0 } | ||
77 | }; | ||
78 | |||
79 | /* Dynamic HID quirks list - specified at runtime */ | 70 | /* Dynamic HID quirks list - specified at runtime */ |
80 | struct quirks_list_struct { | 71 | struct quirks_list_struct { |
81 | struct hid_blacklist hid_bl_item; | 72 | struct hid_blacklist hid_bl_item; |
@@ -303,45 +294,3 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct) | |||
303 | } | 294 | } |
304 | 295 | ||
305 | EXPORT_SYMBOL_GPL(usbhid_lookup_quirk); | 296 | EXPORT_SYMBOL_GPL(usbhid_lookup_quirk); |
306 | |||
307 | static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize) | ||
308 | { | ||
309 | } | ||
310 | |||
311 | /** | ||
312 | * usbhid_fixup_report_descriptor: check if report descriptor needs fixup | ||
313 | * | ||
314 | * Description: | ||
315 | * Walks the hid_rdesc_blacklist[] array and checks whether the device | ||
316 | * is known to have broken report descriptor that needs to be fixed up | ||
317 | * prior to entering the HID parser | ||
318 | * | ||
319 | * Returns: nothing | ||
320 | */ | ||
321 | void usbhid_fixup_report_descriptor(const u16 idVendor, const u16 idProduct, | ||
322 | char *rdesc, unsigned rsize, char **quirks_param) | ||
323 | { | ||
324 | int n, m; | ||
325 | u16 paramVendor, paramProduct; | ||
326 | u32 quirks; | ||
327 | |||
328 | /* static rdesc quirk entries */ | ||
329 | for (n = 0; hid_rdesc_blacklist[n].idVendor; n++) | ||
330 | if (hid_rdesc_blacklist[n].idVendor == idVendor && | ||
331 | hid_rdesc_blacklist[n].idProduct == idProduct) | ||
332 | __usbhid_fixup_report_descriptor(hid_rdesc_blacklist[n].quirks, | ||
333 | rdesc, rsize); | ||
334 | |||
335 | /* runtime rdesc quirk entries handling */ | ||
336 | for (n = 0; quirks_param[n] && n < MAX_USBHID_BOOT_QUIRKS; n++) { | ||
337 | m = sscanf(quirks_param[n], "0x%hx:0x%hx:0x%x", | ||
338 | ¶mVendor, ¶mProduct, &quirks); | ||
339 | |||
340 | if (m != 3) | ||
341 | printk(KERN_WARNING | ||
342 | "Could not parse HID quirk module param %s\n", | ||
343 | quirks_param[n]); | ||
344 | else if (paramVendor == idVendor && paramProduct == idProduct) | ||
345 | __usbhid_fixup_report_descriptor(quirks, rdesc, rsize); | ||
346 | } | ||
347 | } | ||