Skip to content

Commit 0317a65

Browse files
dennisjobrienJiri Kosina
authored andcommitted
usb, HID: Remove Vernier devices from lsusb and hid_ignore_list
Removes Vernier Software & Technology devices from the ldusb driver and the hid_ignore_list table of the usbhid driver in the Linux tree. These devices will now be supported via the hidraw driver. A user space driver for these devices will be found in the Go! Software Development Kit from Vernier at http://www.vernier.com/downloads/software-development-kits/go-sdk/. These devices are also be supported by the LabQuest2 standalone interface shown at http://www.vernier.com/products/interfaces/labq2/ and the LoggerPro for Linux software shown at http://www.vernier.com/downloads/logger-pro-linux/. Signed-off-by: Dennis O'Brien <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent b721260 commit 0317a65

File tree

3 files changed

+0
-22
lines changed

3 files changed

+0
-22
lines changed

drivers/hid/hid-core.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2391,11 +2391,6 @@ static const struct hid_device_id hid_ignore_list[] = {
23912391
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_WTP) },
23922392
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
23932393
#endif
2394-
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
2395-
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
2396-
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
2397-
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
2398-
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
23992394
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
24002395
{ HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },
24012396
{ }

drivers/hid/hid-ids.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -947,13 +947,6 @@
947947
#define USB_DEVICE_ID_VELLEMAN_K8061_FIRST 0x8061
948948
#define USB_DEVICE_ID_VELLEMAN_K8061_LAST 0x8068
949949

950-
#define USB_VENDOR_ID_VERNIER 0x08f7
951-
#define USB_DEVICE_ID_VERNIER_LABPRO 0x0001
952-
#define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002
953-
#define USB_DEVICE_ID_VERNIER_SKIP 0x0003
954-
#define USB_DEVICE_ID_VERNIER_CYCLOPS 0x0004
955-
#define USB_DEVICE_ID_VERNIER_LCSPEC 0x0006
956-
957950
#define USB_VENDOR_ID_VTL 0x0306
958951
#define USB_DEVICE_ID_VTL_MULTITOUCH_FF3F 0xff3f
959952

drivers/usb/misc/ldusb.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@
6969
#define USB_DEVICE_ID_LD_HYBRID 0x2090 /* USB Product ID of Automotive Hybrid */
7070
#define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0 /* USB Product ID of Heat control */
7171

72-
#define USB_VENDOR_ID_VERNIER 0x08f7
73-
#define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002
74-
#define USB_DEVICE_ID_VERNIER_SKIP 0x0003
75-
#define USB_DEVICE_ID_VERNIER_CYCLOPS 0x0004
76-
#define USB_DEVICE_ID_VERNIER_LCSPEC 0x0006
77-
7872
#ifdef CONFIG_USB_DYNAMIC_MINORS
7973
#define USB_LD_MINOR_BASE 0
8074
#else
@@ -115,10 +109,6 @@ static const struct usb_device_id ld_usb_table[] = {
115109
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
116110
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
117111
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
118-
{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
119-
{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
120-
{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
121-
{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
122112
{ } /* Terminating entry */
123113
};
124114
MODULE_DEVICE_TABLE(usb, ld_usb_table);

0 commit comments

Comments
 (0)