leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: vmk80xx: remove support for manual attaching

Browse Source 
This comedi USB driver supports attaching with the auto config
mechanism. Remove the manual attaching support using the
COMEDI_DEVCONFIG ioctl.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-02-05 17:17:36 -07:00 committed by Greg Kroah-Hartman
parent 8b3cc3edb7
commit 07b502f50b
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/comedi/drivers/vmk80xx.c
View File

@ -1189,26 +1189,6 @@ static int vmk80xx_attach_common(struct comedi_device *cdev,
return 0; 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, static int vmk80xx_auto_attach(struct comedi_device *cdev,
unsigned long context_unused) unsigned long context_unused)
{ {
@ -1245,9 +1225,8 @@ static void vmk80xx_detach(struct comedi_device *dev)
static struct comedi_driver vmk80xx_driver = { static struct comedi_driver vmk80xx_driver = {
.module = THIS_MODULE, .module = THIS_MODULE,
.driver_name = "vmk80xx", .driver_name = "vmk80xx",
.attach = vmk80xx_attach,
.detach = vmk80xx_detach,
.auto_attach = vmk80xx_auto_attach, .auto_attach = vmk80xx_auto_attach,
.detach = vmk80xx_detach,
}; };
static int vmk80xx_usb_probe(struct usb_interface *intf, static int vmk80xx_usb_probe(struct usb_interface *intf,