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

staging: comedi: usbduxsigma: push usb (*disconnect) into comedi (*detach)

Browse Source 
The usb_driver (*disconnect) already calls comedi_usb_auto_unconfig(), which
will call the comedi_driver (*detach). Move the other operations in the
(*disconnect) into the (*detach). The comedi_usb_auto_unconfig() can then
be used 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>
This commit is contained in:
H Hartley Sweeten 2013-05-23 12:49:26 -07:00 committed by Greg Kroah-Hartman
parent 65989c030b
commit 9319d4ab44
1 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/staging/comedi/drivers/usbduxsigma.c
View File

@ -2023,15 +2023,23 @@ static int usbduxsigma_auto_attach(struct comedi_device *dev,
static void usbduxsigma_detach(struct comedi_device *dev) static void usbduxsigma_detach(struct comedi_device *dev)
{ {
struct usbduxsigma_private *usb = dev->private; struct usbduxsigma_private *devpriv = dev->private;
if (usb) { if (!devpriv)
down(&usb->sem); return;
dev->private = NULL;
usb->attached = 0; /* stop any running commands */
usb->comedidev = NULL; usbdux_ai_stop(devpriv, devpriv->ai_cmd_running);
up(&usb->sem); usbdux_ao_stop(devpriv, devpriv->ao_cmd_running);
}
down(&start_stop_sem);
down(&devpriv->sem);
dev->private = NULL;
devpriv->attached = 0;
devpriv->comedidev = NULL;
tidy_up(devpriv);
up(&devpriv->sem);
up(&start_stop_sem);
} }
static struct comedi_driver usbduxsigma_driver = { static struct comedi_driver usbduxsigma_driver = {
@ -2107,34 +2115,6 @@ static int usbduxsigma_usb_probe(struct usb_interface *intf,
return comedi_usb_auto_config(intf, &usbduxsigma_driver, 0);; return comedi_usb_auto_config(intf, &usbduxsigma_driver, 0);;
} }
static void usbduxsigma_usb_disconnect(struct usb_interface *intf)
{
struct usbduxsigma_private *usbduxsub_tmp = usb_get_intfdata(intf);
struct usb_device *udev = interface_to_usbdev(intf);
if (!usbduxsub_tmp) {
dev_err(&intf->dev,
"comedi_: disconnect called with null pointer.\n");
return;
}
if (usbduxsub_tmp->usbdev != udev) {
dev_err(&intf->dev, "comedi_: BUG! wrong ptr!\n");
return;
}
if (usbduxsub_tmp->ai_cmd_running)
/* we are still running a command */
usbdux_ai_stop(usbduxsub_tmp, 1);
if (usbduxsub_tmp->ao_cmd_running)
/* we are still running a command */
usbdux_ao_stop(usbduxsub_tmp, 1);
comedi_usb_auto_unconfig(intf);
down(&start_stop_sem);
down(&usbduxsub_tmp->sem);
tidy_up(usbduxsub_tmp);
up(&usbduxsub_tmp->sem);
up(&start_stop_sem);
}
static const struct usb_device_id usbduxsigma_usb_table[] = { static const struct usb_device_id usbduxsigma_usb_table[] = {
{ USB_DEVICE(0x13d8, 0x0020) }, { USB_DEVICE(0x13d8, 0x0020) },
{ USB_DEVICE(0x13d8, 0x0021) }, { USB_DEVICE(0x13d8, 0x0021) },
@ -2146,7 +2126,7 @@ MODULE_DEVICE_TABLE(usb, usbduxsigma_usb_table);
static struct usb_driver usbduxsigma_usb_driver = { static struct usb_driver usbduxsigma_usb_driver = {
.name = "usbduxsigma", .name = "usbduxsigma",
.probe = usbduxsigma_usb_probe, .probe = usbduxsigma_usb_probe,
.disconnect = usbduxsigma_usb_disconnect, .disconnect = comedi_usb_auto_unconfig,
.id_table = usbduxsigma_usb_table, .id_table = usbduxsigma_usb_table,
}; };
module_comedi_usb_driver(usbduxsigma_driver, usbduxsigma_usb_driver); module_comedi_usb_driver(usbduxsigma_driver, usbduxsigma_usb_driver);