Skip to content

Commit

Permalink
staging: comedi: vmk80xx: use comedi_auto_unconfig() for (*disconnect)
Browse files Browse the repository at this point in the history
The usb_driver (*disconnect) in this driver is simply a wrapper around
comedi_auto_unconfig(). Just use comedi_auto_unconfig() directly for
the (*disconnect).

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 9377b92 commit ce87422
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1394,11 +1394,6 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
return -ENODEV;
}

static void vmk80xx_usb_disconnect(struct usb_interface *intf)
{
comedi_usb_auto_unconfig(intf);
}

static const struct usb_device_id vmk80xx_usb_id_table[] = {
{ USB_DEVICE(0x10cf, 0x5500), .driver_info = DEVICE_VMK8055 },
{ USB_DEVICE(0x10cf, 0x5501), .driver_info = DEVICE_VMK8055 },
Expand All @@ -1416,13 +1411,11 @@ static const struct usb_device_id vmk80xx_usb_id_table[] = {
};
MODULE_DEVICE_TABLE(usb, vmk80xx_usb_id_table);

/* TODO: Add support for suspend, resume, pre_reset,
* post_reset and flush */
static struct usb_driver vmk80xx_usb_driver = {
.name = "vmk80xx",
.probe = vmk80xx_usb_probe,
.disconnect = vmk80xx_usb_disconnect,
.id_table = vmk80xx_usb_id_table,
.probe = vmk80xx_usb_probe,
.disconnect = comedi_usb_auto_unconfig,
};
module_comedi_usb_driver(vmk80xx_driver, vmk80xx_usb_driver);

Expand Down

0 comments on commit ce87422

Please sign in to comment.