From 5f31503e63d09ddc14319cda97b9f5e8a6c1aefa Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 5 Feb 2013 17:17:36 -0700 Subject: [PATCH] --- yaml --- r: 354423 b: refs/heads/master c: 07b502f50bfc290222fe4032501619a44bbd777e h: refs/heads/master i: 354421: 58ab23c99ac3d38026e28cabc5d5cb580cc0aff4 354419: b5c6aa5c9b1818f684a9b20b1a0298f2d4ef16f4 354415: 64476acde9f7edef10257fd8592a04fc7a570ab1 v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/vmk80xx.c | 23 +------------------ 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 5dc268a96df6..c5761a81e426 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b3cc3edb745cbc131560d19e3f32d81c07454b1 +refs/heads/master: 07b502f50bfc290222fe4032501619a44bbd777e diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c index 609dc6915997..f5a999c60763 100644 --- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c +++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c @@ -1189,26 +1189,6 @@ static int vmk80xx_attach_common(struct comedi_device *cdev, return 0; } -/* called for COMEDI_DEVCONFIG ioctl for board_name "vmk80xx" */ -static int vmk80xx_attach(struct comedi_device *cdev, - struct comedi_devconfig *it) -{ - int i; - int ret; - - mutex_lock(&glb_mutex); - for (i = 0; i < VMK80XX_MAX_BOARDS; i++) - if (vmb[i].probed && !vmb[i].attached) - break; - if (i == VMK80XX_MAX_BOARDS) - ret = -ENODEV; - else - ret = vmk80xx_attach_common(cdev, &vmb[i]); - mutex_unlock(&glb_mutex); - return ret; -} - -/* called via comedi_usb_auto_config() */ static int vmk80xx_auto_attach(struct comedi_device *cdev, unsigned long context_unused) { @@ -1245,9 +1225,8 @@ static void vmk80xx_detach(struct comedi_device *dev) static struct comedi_driver vmk80xx_driver = { .module = THIS_MODULE, .driver_name = "vmk80xx", - .attach = vmk80xx_attach, - .detach = vmk80xx_detach, .auto_attach = vmk80xx_auto_attach, + .detach = vmk80xx_detach, }; static int vmk80xx_usb_probe(struct usb_interface *intf,