]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: vmk80xx: use auto_attach() hook
authorIan Abbott <abbotti@mev.co.uk>
Sat, 27 Oct 2012 20:44:17 +0000 (21:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Oct 2012 22:02:08 +0000 (15:02 -0700)
Use the new `auto_attach()` hook in the `struct comedi_driver` instead
of the old `attach_usb()` hook.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/vmk80xx.c

index 366490776c5a48ac9974bff8066a380796414438..609dc691599712ebc7a95b79248238fe3fc7f9e1 100644 (file)
@@ -1209,9 +1209,10 @@ static int vmk80xx_attach(struct comedi_device *cdev,
 }
 
 /* called via comedi_usb_auto_config() */
-static int vmk80xx_attach_usb(struct comedi_device *cdev,
-                             struct usb_interface *intf)
+static int vmk80xx_auto_attach(struct comedi_device *cdev,
+                              unsigned long context_unused)
 {
+       struct usb_interface *intf = comedi_to_usb_interface(cdev);
        int i;
        int ret;
 
@@ -1246,7 +1247,7 @@ static struct comedi_driver vmk80xx_driver = {
        .driver_name    = "vmk80xx",
        .attach         = vmk80xx_attach,
        .detach         = vmk80xx_detach,
-       .attach_usb     = vmk80xx_attach_usb,
+       .auto_attach    = vmk80xx_auto_attach,
 };
 
 static int vmk80xx_usb_probe(struct usb_interface *intf,