openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: usbduxsigma: remove 'comedidev' from the private data 

This back pointer to the comedi_device is not needed in the private
data. Remove it.

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:51:37 -07:00 committed by Greg Kroah-Hartman
parent 6028f4c01c
commit f62024e5ae
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,8 +191,6 @@ struct usbduxsigma_private {
int16_t *outBuffer;
/* interface structure in 2.6 */
struct usb_interface *interface;
/* comedi device for the interrupt context */
struct comedi_device *comedidev;
/* is it USB_SPEED_HIGH or not? */
short int high_speed;
/* asynchronous command is running */
@ -412,7 +410,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
if (devpriv->ao_cmd_running) {
usbdux_ao_stop(devpriv, 0); /* w/o unlink */
s->async->events |= COMEDI_CB_EOA;
comedi_event(devpriv->comedidev, s);
comedi_event(dev, s);
}
return;
@ -424,7 +422,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
__func__, urb->status);
usbdux_ao_stop(devpriv, 0); /* w/o unlink */
s->async->events |= (COMEDI_CB_ERROR | COMEDI_CB_EOA);
comedi_event(devpriv->comedidev, s);
comedi_event(dev, s);
}
return;
}
@ -444,7 +442,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
usbdux_ao_stop(devpriv, 0); /* w/o unlink */
/* acquistion is over, tell comedi */
s->async->events |= COMEDI_CB_EOA;
comedi_event(devpriv->comedidev, s);
comedi_event(dev, s);
return;
}
}
@ -1745,8 +1743,6 @@ static int usbduxsigma_attach_common(struct comedi_device *dev)
int offset;
down(&uds->sem);
/* pointer back to the corresponding comedi device */
uds->comedidev = dev;
/* set number of subdevices */
if (uds->high_speed)
@ -1993,7 +1989,6 @@ static void usbduxsigma_detach(struct comedi_device *dev)
usbdux_ao_stop(devpriv, devpriv->ao_cmd_running);
down(&devpriv->sem);
devpriv->comedidev = NULL;
tidy_up(devpriv);
up(&devpriv->sem);
}