summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2012-10-28 00:44:17 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-30 02:02:08 +0400
commit392ba7bc37b453ae056542045fd7b8b349c7978e (patch)
tree1f400847691ba6890b06eadae95682c56b37d4a0
parent0a577b823d0202b94eeef0e6b2b5653527fd6134 (diff)
downloadlinux-392ba7bc37b453ae056542045fd7b8b349c7978e.tar.xz
staging: comedi: vmk80xx: use auto_attach() hook
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>
-rw-r--r--drivers/staging/comedi/drivers/vmk80xx.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 366490776c5a..609dc6915997 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -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,