HID: move petalynx quirks

Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>

HID: move petalynx quirks
Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Jiri Slaby · Jiri Kosina
1 parent b5635b129b
Showing 8 changed files with 134 additions and 55 deletions Side-by-side Diff
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-dummy.c
drivers/hid/hid-input-quirks.c
drivers/hid/hid-petalynx.c
drivers/hid/usbhid/hid-quirks.c
include/linux/hid.h
@@ -154,6 +154,13 @@
 	Support for some Microsoft devices which breaks less or more
 	HID specification.
  
+config HID_PETALYNX
+	tristate "Petalynx"
+	default m
+	depends on USB_HID
+	---help---
+	Support for Petalynx Maxter remote.
+
 config HID_SUNPLUS
 	tristate "Sunplus"
 	default m
@@ -21,6 +21,7 @@
 obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o
 obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o
 obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o
+obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o
 obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o
  
 obj-$(CONFIG_USB_HID)		+= usbhid/
@@ -1191,6 +1191,7 @@
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
  
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
@@ -31,6 +31,9 @@
 #ifdef CONFIG_HID_MICROSOFT_MODULE
 	HID_COMPAT_CALL_DRIVER(microsoft);
 #endif
+#ifdef CONFIG_HID_PETALYNX_MODULE
+	HID_COMPAT_CALL_DRIVER(petalynx);
+#endif
 #ifdef CONFIG_HID_SUNPLUS_MODULE
 	HID_COMPAT_CALL_DRIVER(sunplus);
 #endif
@@ -42,34 +42,6 @@
 	return 1;
 }
  
-static int quirk_petalynx_remote(struct hid_usage *usage,
-		struct hid_input *hidinput, unsigned long **bit, int *max)
-{
-	if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &&
-			((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER))
-		return 0;
-
-	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_LOGIVENDOR)
-		switch(usage->hid & HID_USAGE) {
-			case 0x05a: map_key_clear(KEY_TEXT);		break;
-			case 0x05b: map_key_clear(KEY_RED);		break;
-			case 0x05c: map_key_clear(KEY_GREEN);		break;
-			case 0x05d: map_key_clear(KEY_YELLOW);		break;
-			case 0x05e: map_key_clear(KEY_BLUE);		break;
-			default:
-				return 0;
-		}
-
-	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER)
-		switch(usage->hid & HID_USAGE) {
-			case 0x0f6: map_key_clear(KEY_NEXT);            break;
-			case 0x0fa: map_key_clear(KEY_BACK);            break;
-			default:
-				return 0;
-		}
-	return 1;
-}
-
 static int quirk_cherry_genius_29e(struct hid_usage *usage,
 		struct hid_input *hidinput, unsigned long **bit, int *max)
 {
@@ -94,9 +66,6 @@
 #define VENDOR_ID_MONTEREY			0x0566
 #define DEVICE_ID_GENIUS_KB29E			0x3004
  
-#define VENDOR_ID_PETALYNX			0x18b1
-#define DEVICE_ID_PETALYNX_MAXTER_REMOTE	0x0037
-
 static const struct hid_input_blacklist {
 	__u16 idVendor;
 	__u16 idProduct;
@@ -106,8 +75,6 @@
 	{ VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },
  
 	{ VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
-
-	{ VENDOR_ID_PETALYNX, DEVICE_ID_PETALYNX_MAXTER_REMOTE, quirk_petalynx_remote },
  
 	{ 0, 0, NULL }
 };
+/*
+ *  HID driver for some petalynx "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+/* Petalynx Maxter Remote has maximum for consumer page set too low */
+static void pl_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+		unsigned int rsize)
+{
+	if (rsize >= 60 && rdesc[39] == 0x2a && rdesc[40] == 0xf5 &&
+			rdesc[41] == 0x00 && rdesc[59] == 0x26 &&
+			rdesc[60] == 0xf9 && rdesc[61] == 0x00) {
+		dev_info(&hdev->dev, "fixing up Petalynx Maxter Remote report "
+				"descriptor\n");
+		rdesc[60] = 0xfa;
+		rdesc[40] = 0xfa;
+	}
+}
+
+#define pl_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \
+					EV_KEY, (c))
+static int pl_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+		struct hid_field *field, struct hid_usage *usage,
+		unsigned long **bit, int *max)
+{
+	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_LOGIVENDOR) {
+		switch (usage->hid & HID_USAGE) {
+		case 0x05a: pl_map_key_clear(KEY_TEXT);		break;
+		case 0x05b: pl_map_key_clear(KEY_RED);		break;
+		case 0x05c: pl_map_key_clear(KEY_GREEN);	break;
+		case 0x05d: pl_map_key_clear(KEY_YELLOW);	break;
+		case 0x05e: pl_map_key_clear(KEY_BLUE);		break;
+		default:
+			return 0;
+		}
+		return 1;
+	}
+
+	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER) {
+		switch (usage->hid & HID_USAGE) {
+		case 0x0f6: pl_map_key_clear(KEY_NEXT);		break;
+		case 0x0fa: pl_map_key_clear(KEY_BACK);		break;
+		default:
+			return 0;
+		}
+		return 1;
+	}
+
+	return 0;
+}
+
+static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+	int ret;
+
+	hdev->quirks |= HID_QUIRK_NOGET;
+
+	ret = hid_parse(hdev);
+	if (ret) {
+		dev_err(&hdev->dev, "parse failed\n");
+		goto err_free;
+	}
+
+	ret = hid_hw_start(hdev);
+	if (ret) {
+		dev_err(&hdev->dev, "hw start failed\n");
+		goto err_free;
+	}
+
+	return 0;
+err_free:
+	return ret;
+}
+
+static const struct hid_device_id pl_devices[] = {
+	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
+	{ }
+};
+MODULE_DEVICE_TABLE(hid, pl_devices);
+
+static struct hid_driver pl_driver = {
+	.name = "petalynx",
+	.id_table = pl_devices,
+	.report_fixup = pl_report_fixup,
+	.input_mapping = pl_input_mapping,
+	.probe = pl_probe,
+};
+
+static int pl_init(void)
+{
+	return hid_register_driver(&pl_driver);
+}
+
+static void pl_exit(void)
+{
+	hid_unregister_driver(&pl_driver);
+}
+
+module_init(pl_init);
+module_exit(pl_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(petalynx);
@@ -57,7 +57,6 @@
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
-	{ USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
@@ -78,8 +77,6 @@
 } hid_rdesc_blacklist[] = {
 	{ USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E, HID_QUIRK_RDESC_BUTTON_CONSUMER },
  
-	{ USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_RDESC_PETALYNX },
-
 	{ USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE },
  
 	{ 0, 0 }
@@ -340,21 +337,6 @@
 	}
 }
  
-/* Petalynx Maxter Remote has maximum for consumer page set too low */
-static void usbhid_fixup_petalynx_descriptor(unsigned char *rdesc, int rsize)
-{
-	if (rsize >= 60 && rdesc[39] == 0x2a
-			&& rdesc[40] == 0xf5
-			&& rdesc[41] == 0x00
-			&& rdesc[59] == 0x26
-			&& rdesc[60] == 0xf9
-			&& rdesc[61] == 0x00) {
-		printk(KERN_INFO "Fixing up Petalynx Maxter Remote report descriptor\n");
-		rdesc[60] = 0xfa;
-		rdesc[40] = 0xfa;
-	}
-}
-
 static void usbhid_fixup_button_consumer_descriptor(unsigned char *rdesc, int rsize)
 {
 	if (rsize >= 30 && rdesc[29] == 0x05
@@ -366,9 +348,6 @@
  
 static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)
 {
-	if (quirks & HID_QUIRK_RDESC_PETALYNX)
-		usbhid_fixup_petalynx_descriptor(rdesc, rsize);
-
 	if (quirks & HID_QUIRK_RDESC_BUTTON_CONSUMER)
 		usbhid_fixup_button_consumer_descriptor(rdesc, rsize);
  
@@ -272,7 +272,6 @@
  * Separate quirks for runtime report descriptor fixup
  */
  
-#define HID_QUIRK_RDESC_PETALYNX		0x00000008
 #define HID_QUIRK_RDESC_BUTTON_CONSUMER		0x00000020
 #define HID_QUIRK_RDESC_SAMSUNG_REMOTE		0x00000040
...	...	@@ -154,6 +154,13 @@
154	154	Support for some Microsoft devices which breaks less or more
155	155	HID specification.
156	156
	157	+config HID_PETALYNX
	158	+ tristate "Petalynx"
	159	+ default m
	160	+ depends on USB_HID
	161	+ ---help---
	162	+ Support for Petalynx Maxter remote.
	163	+
157	164	config HID_SUNPLUS
158	165	tristate "Sunplus"
159	166	default m
...	...	@@ -21,6 +21,7 @@
21	21	obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
22	22	obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o
23	23	obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o
	24	+obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
24	25	obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
25	26
26	27	obj-$(CONFIG_USB_HID) += usbhid/
...	...	@@ -1191,6 +1191,7 @@
1191	1191	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },
1192	1192	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
1193	1193	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
	1194	+ { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
1194	1195	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
1195	1196
1196	1197	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
...	...	@@ -31,6 +31,9 @@
31	31	#ifdef CONFIG_HID_MICROSOFT_MODULE
32	32	HID_COMPAT_CALL_DRIVER(microsoft);
33	33	#endif
	34	+#ifdef CONFIG_HID_PETALYNX_MODULE
	35	+ HID_COMPAT_CALL_DRIVER(petalynx);
	36	+#endif
34	37	#ifdef CONFIG_HID_SUNPLUS_MODULE
35	38	HID_COMPAT_CALL_DRIVER(sunplus);
36	39	#endif
...	...	@@ -42,34 +42,6 @@
42	42	return 1;
43	43	}
44	44
45		-static int quirk_petalynx_remote(struct hid_usage *usage,
46		- struct hid_input hidinput, unsigned long bit, int max)
47		-{
48		- if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &&
49		- ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER))
50		- return 0;
51		-
52		- if ((usage->hid & HID_USAGE_PAGE) == HID_UP_LOGIVENDOR)
53		- switch(usage->hid & HID_USAGE) {
54		- case 0x05a: map_key_clear(KEY_TEXT); break;
55		- case 0x05b: map_key_clear(KEY_RED); break;
56		- case 0x05c: map_key_clear(KEY_GREEN); break;
57		- case 0x05d: map_key_clear(KEY_YELLOW); break;
58		- case 0x05e: map_key_clear(KEY_BLUE); break;
59		- default:
60		- return 0;
61		- }
62		-
63		- if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER)
64		- switch(usage->hid & HID_USAGE) {
65		- case 0x0f6: map_key_clear(KEY_NEXT); break;
66		- case 0x0fa: map_key_clear(KEY_BACK); break;
67		- default:
68		- return 0;
69		- }
70		- return 1;
71		-}
72		-
73	45	static int quirk_cherry_genius_29e(struct hid_usage *usage,
74	46	struct hid_input hidinput, unsigned long bit, int max)
75	47	{
...	...	@@ -94,9 +66,6 @@
94	66	#define VENDOR_ID_MONTEREY 0x0566
95	67	#define DEVICE_ID_GENIUS_KB29E 0x3004
96	68
97		-#define VENDOR_ID_PETALYNX 0x18b1
98		-#define DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
99		-
100	69	static const struct hid_input_blacklist {
101	70	__u16 idVendor;
102	71	__u16 idProduct;
...	...	@@ -106,8 +75,6 @@
106	75	{ VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },
107	76
108	77	{ VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
109		-
110		- { VENDOR_ID_PETALYNX, DEVICE_ID_PETALYNX_MAXTER_REMOTE, quirk_petalynx_remote },
111	78
112	79	{ 0, 0, NULL }
113	80	};
	1	+/*
	2	+ * HID driver for some petalynx "special" devices
	3	+ *
	4	+ * Copyright (c) 1999 Andreas Gal
	5	+ * Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
	6	+ * Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
	7	+ * Copyright (c) 2006-2007 Jiri Kosina
	8	+ * Copyright (c) 2007 Paul Walmsley
	9	+ * Copyright (c) 2008 Jiri Slaby
	10	+ */
	11	+
	12	+/*
	13	+ * This program is free software; you can redistribute it and/or modify it
	14	+ * under the terms of the GNU General Public License as published by the Free
	15	+ * Software Foundation; either version 2 of the License, or (at your option)
	16	+ * any later version.
	17	+ */
	18	+
	19	+#include <linux/device.h>
	20	+#include <linux/hid.h>
	21	+#include <linux/module.h>
	22	+
	23	+#include "hid-ids.h"
	24	+
	25	+/* Petalynx Maxter Remote has maximum for consumer page set too low */
	26	+static void pl_report_fixup(struct hid_device hdev, __u8 rdesc,
	27	+ unsigned int rsize)
	28	+{
	29	+ if (rsize >= 60 && rdesc[39] == 0x2a && rdesc[40] == 0xf5 &&
	30	+ rdesc[41] == 0x00 && rdesc[59] == 0x26 &&
	31	+ rdesc[60] == 0xf9 && rdesc[61] == 0x00) {
	32	+ dev_info(&hdev->dev, "fixing up Petalynx Maxter Remote report "
	33	+ "descriptor\n");
	34	+ rdesc[60] = 0xfa;
	35	+ rdesc[40] = 0xfa;
	36	+ }
	37	+}
	38	+
	39	+#define pl_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \
	40	+ EV_KEY, (c))
	41	+static int pl_input_mapping(struct hid_device hdev, struct hid_input hi,
	42	+ struct hid_field field, struct hid_usage usage,
	43	+ unsigned long *bit, int max)
	44	+{
	45	+ if ((usage->hid & HID_USAGE_PAGE) == HID_UP_LOGIVENDOR) {
	46	+ switch (usage->hid & HID_USAGE) {
	47	+ case 0x05a: pl_map_key_clear(KEY_TEXT); break;
	48	+ case 0x05b: pl_map_key_clear(KEY_RED); break;
	49	+ case 0x05c: pl_map_key_clear(KEY_GREEN); break;
	50	+ case 0x05d: pl_map_key_clear(KEY_YELLOW); break;
	51	+ case 0x05e: pl_map_key_clear(KEY_BLUE); break;
	52	+ default:
	53	+ return 0;
	54	+ }
	55	+ return 1;
	56	+ }
	57	+
	58	+ if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER) {
	59	+ switch (usage->hid & HID_USAGE) {
	60	+ case 0x0f6: pl_map_key_clear(KEY_NEXT); break;
	61	+ case 0x0fa: pl_map_key_clear(KEY_BACK); break;
	62	+ default:
	63	+ return 0;
	64	+ }
	65	+ return 1;
	66	+ }
	67	+
	68	+ return 0;
	69	+}
	70	+
	71	+static int pl_probe(struct hid_device hdev, const struct hid_device_id id)
	72	+{
	73	+ int ret;
	74	+
	75	+ hdev->quirks \|= HID_QUIRK_NOGET;
	76	+
	77	+ ret = hid_parse(hdev);
	78	+ if (ret) {
	79	+ dev_err(&hdev->dev, "parse failed\n");
	80	+ goto err_free;
	81	+ }
	82	+
	83	+ ret = hid_hw_start(hdev);
	84	+ if (ret) {
	85	+ dev_err(&hdev->dev, "hw start failed\n");
	86	+ goto err_free;
	87	+ }
	88	+
	89	+ return 0;
	90	+err_free:
	91	+ return ret;
	92	+}
	93	+
	94	+static const struct hid_device_id pl_devices[] = {
	95	+ { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
	96	+ { }
	97	+};
	98	+MODULE_DEVICE_TABLE(hid, pl_devices);
	99	+
	100	+static struct hid_driver pl_driver = {
	101	+ .name = "petalynx",
	102	+ .id_table = pl_devices,
	103	+ .report_fixup = pl_report_fixup,
	104	+ .input_mapping = pl_input_mapping,
	105	+ .probe = pl_probe,
	106	+};
	107	+
	108	+static int pl_init(void)
	109	+{
	110	+ return hid_register_driver(&pl_driver);
	111	+}
	112	+
	113	+static void pl_exit(void)
	114	+{
	115	+ hid_unregister_driver(&pl_driver);
	116	+}
	117	+
	118	+module_init(pl_init);
	119	+module_exit(pl_exit);
	120	+MODULE_LICENSE("GPL");
	121	+
	122	+HID_COMPAT_LOAD_DRIVER(petalynx);
...	...	@@ -57,7 +57,6 @@
57	57	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
58	58	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
59	59	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
60		- { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_NOGET },
61	60	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
62	61	{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
63	62	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET \| HID_QUIRK_MULTI_INPUT \| HID_QUIRK_SKIP_OUTPUT_REPORTS },
...	...	@@ -78,8 +77,6 @@
78	77	} hid_rdesc_blacklist[] = {
79	78	{ USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E, HID_QUIRK_RDESC_BUTTON_CONSUMER },
80	79
81		- { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_RDESC_PETALYNX },
82		-
83	80	{ USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE },
84	81
85	82	{ 0, 0 }
...	...	@@ -340,21 +337,6 @@
340	337	}
341	338	}
342	339
343		-/* Petalynx Maxter Remote has maximum for consumer page set too low */
344		-static void usbhid_fixup_petalynx_descriptor(unsigned char *rdesc, int rsize)
345		-{
346		- if (rsize >= 60 && rdesc[39] == 0x2a
347		- && rdesc[40] == 0xf5
348		- && rdesc[41] == 0x00
349		- && rdesc[59] == 0x26
350		- && rdesc[60] == 0xf9
351		- && rdesc[61] == 0x00) {
352		- printk(KERN_INFO "Fixing up Petalynx Maxter Remote report descriptor\n");
353		- rdesc[60] = 0xfa;
354		- rdesc[40] = 0xfa;
355		- }
356		-}
357		-
358	340	static void usbhid_fixup_button_consumer_descriptor(unsigned char *rdesc, int rsize)
359	341	{
360	342	if (rsize >= 30 && rdesc[29] == 0x05
...	...	@@ -366,9 +348,6 @@
366	348
367	349	static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)
368	350	{
369		- if (quirks & HID_QUIRK_RDESC_PETALYNX)
370		- usbhid_fixup_petalynx_descriptor(rdesc, rsize);
371		-
372	351	if (quirks & HID_QUIRK_RDESC_BUTTON_CONSUMER)
373	352	usbhid_fixup_button_consumer_descriptor(rdesc, rsize);
374	353
...	...	@@ -272,7 +272,6 @@
272	272	* Separate quirks for runtime report descriptor fixup
273	273	*/
274	274
275		-#define HID_QUIRK_RDESC_PETALYNX 0x00000008
276	275	#define HID_QUIRK_RDESC_BUTTON_CONSUMER 0x00000020
277	276	#define HID_QUIRK_RDESC_SAMSUNG_REMOTE 0x00000040
278	277