usb: Remove Vernier devices from lsusb and hid_ignore_list

PATCH Applied Dennis O'Brien 3 participants 6 messages May 21, 2015 – Jun 1, 2015

Subsystems (2)

USB HID

lore

Share & tools

lore

Dennis O'Brien

author

2015-05-21 14:43 UTC #0 lore raw

PATCH 1/1 usb: Remove Vernier devices from lsusb and hid_ignore_list

From: Dennis O'Brien <[email protected]>

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]>

---
 drivers/hid/hid-core.c   |    5 -----
 drivers/hid/hid-ids.h    |    7 -------
 drivers/usb/misc/ldusb.c |   10 ----------
 3 files changed, 0 insertions(+), 22 deletions(-)

drivers/hid/hid-core.c +0 -0

index 722a925..3a9abfe 100644
@@ -2399,11 +2399,6 @@ static const struct hid_device_id hid_ignore_list[] = {
     { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS,

USB_DEVICE_ID_SYNAPTICS_WTP) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS,
USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif

-    { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
-    { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
-    { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
-    { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
-    { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },

{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP,
USB_DEVICE_ID_4_PHIDGETSERVO_20) },
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP,
USB_DEVICE_ID_1_PHIDGETSERVO_20) },
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP,
USB_DEVICE_ID_8_8_4_IF_KIT) },

drivers/hid/hid-ids.h +0 -7

index 41f167e..9036beb 100644
@@ -957,13 +957,6 @@
 #define USB_DEVICE_ID_VELLEMAN_K8061_FIRST    0x8061
 #define USB_DEVICE_ID_VELLEMAN_K8061_LAST    0x8068
 
-#define USB_VENDOR_ID_VERNIER        0x08f7
-#define USB_DEVICE_ID_VERNIER_LABPRO    0x0001
-#define USB_DEVICE_ID_VERNIER_GOTEMP    0x0002
-#define USB_DEVICE_ID_VERNIER_SKIP    0x0003
-#define USB_DEVICE_ID_VERNIER_CYCLOPS    0x0004
-#define USB_DEVICE_ID_VERNIER_LCSPEC    0x0006
-
 #define USB_VENDOR_ID_VTL        0x0306
 #define USB_DEVICE_ID_VTL_MULTITOUCH_FF3F    0xff3f

drivers/usb/misc/ldusb.c +0 -0

index 82503a7..cce22ff 100644
@@ -69,12 +69,6 @@
 #define USB_DEVICE_ID_LD_HYBRID        0x2090    /* USB Product ID of

Automotive Hybrid */
#define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0 /* USB Product ID of
Heat control */

-#define USB_VENDOR_ID_VERNIER 0x08f7
-#define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002
-#define USB_DEVICE_ID_VERNIER_SKIP 0x0003
-#define USB_DEVICE_ID_VERNIER_CYCLOPS 0x0004
-#define USB_DEVICE_ID_VERNIER_LCSPEC 0x0006
-
#ifdef CONFIG_USB_DYNAMIC_MINORS
#define USB_LD_MINOR_BASE 0
#else
@@ -115,10 +109,6 @@ static const struct usb_device_id ld_usb_table[] = {
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) }, { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },

-    { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
-    { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
-    { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
-    { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },

{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, ld_usb_table);

Signature · 1 line

1.7.0.4

Jiri Kosina

2015-05-28 14:58 UTC #1 lore raw

Quoted 7 lines · Dennis O'Brien

From: Dennis O'Brien <[email protected]>
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.

Quoted 7 lines

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/.

Given that the only thing this patch is in principle doing is dropping device support from ldusb driver, I am not applying it before getting Ack from Greg (or even seeing Greg merging it himself through his tree).

Greg ... ?

Thanks,

Signature · 2 lines

Jiri Kosina
SUSE Labs

Greg KH

maintainer Acked-by

2015-05-28 16:24 UTC #2 lore raw

Quoted 17 lines · Jiri Kosina

Quoted 7 lines · Dennis O'Brien
From: Dennis O'Brien <[email protected]>
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.
Quoted 7 lines
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/.

Quoted 5 lines

Given that the only thing this patch is in principle doing is dropping device support from ldusb driver, I am not applying it before getting Ack from Greg (or even seeing Greg merging it himself through his tree).
Greg ... ?

No objection from me:

Acked-by Greg Kroah-Hartman <[email protected]>

But if you want me to take it in my tree, I can do that too, just provide an ack and I will do so.

thanks,

greg k-h

Jiri Kosina

2015-05-29 09:30 UTC #3 lore raw

Quoted 22 lines · Greg KH

Quoted 21 lines · Jiri Kosina
Quoted 7 lines · Dennis O'Brien
From: Dennis O'Brien <[email protected]>
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.
Quoted 7 lines
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/.
Given that the only thing this patch is in principle doing is dropping device support from ldusb driver, I am not applying it before getting Ack from Greg (or even seeing Greg merging it himself through his tree).

Quoted 8 lines

Quoted 1 line
Greg ... ?
No objection from me:
Acked-by Greg Kroah-Hartman <[email protected]>
But if you want me to take it in my tree, I can do that too, just provide an ack and I will do so.

Thanks. That's fine, I'll take it.

However, Dennis, the patch has been damaged by your mail client (it's line-wrapped). Could you please fix that and resend? I'll then take it through my tree.

Signature · 2 lines

Jiri Kosina
SUSE Labs

Dennis O'Brien

author

2015-05-31 16:20 UTC #4 lore raw

PATCH 1/1 usb: Remove Vernier devices from lsusb and hid_ignore_list

In reply to Dennis O'Brien

From: Dennis O'Brien <[email protected]>

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.

Signed-off-by Dennis O'Brien <[email protected]>

Acked-by Greg Kroah-Hartman <[email protected]>

---
 drivers/hid/hid-core.c   |    5 -----
 drivers/hid/hid-ids.h    |    7 -------
 drivers/usb/misc/ldusb.c |   10 ----------
 3 files changed, 0 insertions(+), 22 deletions(-)

drivers/hid/hid-core.c +0 -5

index 722a925..3a9abfe 100644
@@ -2399,11 +2399,6 @@ static const struct hid_device_id hid_ignore_list[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_WTP) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
 #endif
-	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },

drivers/hid/hid-ids.h +0 -7

index 41f167e..9036beb 100644
@@ -957,13 +957,6 @@
 #define USB_DEVICE_ID_VELLEMAN_K8061_FIRST	0x8061
 #define USB_DEVICE_ID_VELLEMAN_K8061_LAST	0x8068
 
-#define USB_VENDOR_ID_VERNIER		0x08f7
-#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001
-#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002
-#define USB_DEVICE_ID_VERNIER_SKIP	0x0003
-#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004
-#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006
-
 #define USB_VENDOR_ID_VTL		0x0306
 #define USB_DEVICE_ID_VTL_MULTITOUCH_FF3F	0xff3f

drivers/usb/misc/ldusb.c +0 ~~-10~~

index 82503a7..cce22ff 100644
@@ -69,12 +69,6 @@
 #define USB_DEVICE_ID_LD_HYBRID		0x2090	/* USB Product ID of Automotive Hybrid */
 #define USB_DEVICE_ID_LD_HEATCONTROL	0x20A0	/* USB Product ID of Heat control */
 
-#define USB_VENDOR_ID_VERNIER		0x08f7
-#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002
-#define USB_DEVICE_ID_VERNIER_SKIP	0x0003
-#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004
-#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006
-
 #ifdef CONFIG_USB_DYNAMIC_MINORS
 #define USB_LD_MINOR_BASE	0
 #else

@@ -115,10 +109,6 @@ static const struct usb_device_id ld_usb_table[] = {
 	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
 	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
 	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
-	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
-	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
-	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
-	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
 	{ }					/* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, ld_usb_table);

Signature · 1 line

1.7.0.4

Jiri Kosina

Applied

2015-06-01 12:45 UTC #5 lore raw

Quoted 15 lines · Dennis O'Brien

From: Dennis O'Brien <[email protected]>
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/.

Quoted 2 lines

Signed-off-by Dennis O'Brien <[email protected]>
Acked-by Greg Kroah-Hartman <[email protected]>

Applied to hid.git#for-4.2/upstream.

Thanks,

Signature · 2 lines

Jiri Kosina
SUSE Labs