---

yaml --- r: 354425 b: refs/heads/master c: ce87422 h: refs/heads/master i: 354423: 5f31503 v: v3
git-mirror · Feb 6, 2013 · 53a4cab · 53a4cab
1 parent a95af55
commit 53a4cab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9377b9234f159773a53c7277559cc24397dd9803
+refs/heads/master: ce87422743608b436da9e0ce34d01519cd75ea3e
diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1394,11 +1394,6 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 	return -ENODEV;
 }
 
-static void vmk80xx_usb_disconnect(struct usb_interface *intf)
-{
-	comedi_usb_auto_unconfig(intf);
-}
-
 static const struct usb_device_id vmk80xx_usb_id_table[] = {
 	{ USB_DEVICE(0x10cf, 0x5500), .driver_info = DEVICE_VMK8055 },
 	{ USB_DEVICE(0x10cf, 0x5501), .driver_info = DEVICE_VMK8055 },
@@ -1416,13 +1411,11 @@ static const struct usb_device_id vmk80xx_usb_id_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, vmk80xx_usb_id_table);
 
-/* TODO: Add support for suspend, resume, pre_reset,
- * post_reset and flush */
 static struct usb_driver vmk80xx_usb_driver = {
 	.name		= "vmk80xx",
-	.probe		= vmk80xx_usb_probe,
-	.disconnect	= vmk80xx_usb_disconnect,
 	.id_table	= vmk80xx_usb_id_table,
+	.probe		= vmk80xx_usb_probe,
+	.disconnect	= comedi_usb_auto_unconfig,
 };
 module_comedi_usb_driver(vmk80xx_driver, vmk80xx_usb_driver);