Skip to content

Commit

Permalink
staging: comedi: vmk80xx: remove support for manual attaching
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent 8b3cc3e commit 07b502f
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 07b502f

Please sign in to comment.