Commit f62024e5 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6028f4c0
...@@ -191,8 +191,6 @@ struct usbduxsigma_private { ...@@ -191,8 +191,6 @@ struct usbduxsigma_private {
int16_t *outBuffer; int16_t *outBuffer;
/* interface structure in 2.6 */ /* interface structure in 2.6 */
struct usb_interface *interface; struct usb_interface *interface;
/* comedi device for the interrupt context */
struct comedi_device *comedidev;
/* is it USB_SPEED_HIGH or not? */ /* is it USB_SPEED_HIGH or not? */
short int high_speed; short int high_speed;
/* asynchronous command is running */ /* asynchronous command is running */
...@@ -412,7 +410,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) ...@@ -412,7 +410,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
if (devpriv->ao_cmd_running) { if (devpriv->ao_cmd_running) {
usbdux_ao_stop(devpriv, 0); /* w/o unlink */ usbdux_ao_stop(devpriv, 0); /* w/o unlink */
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
comedi_event(devpriv->comedidev, s); comedi_event(dev, s);
} }
return; return;
...@@ -424,7 +422,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) ...@@ -424,7 +422,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
__func__, urb->status); __func__, urb->status);
usbdux_ao_stop(devpriv, 0); /* w/o unlink */ usbdux_ao_stop(devpriv, 0); /* w/o unlink */
s->async->events |= (COMEDI_CB_ERROR | COMEDI_CB_EOA); s->async->events |= (COMEDI_CB_ERROR | COMEDI_CB_EOA);
comedi_event(devpriv->comedidev, s); comedi_event(dev, s);
} }
return; return;
} }
...@@ -444,7 +442,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) ...@@ -444,7 +442,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
usbdux_ao_stop(devpriv, 0); /* w/o unlink */ usbdux_ao_stop(devpriv, 0); /* w/o unlink */
/* acquistion is over, tell comedi */ /* acquistion is over, tell comedi */
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
comedi_event(devpriv->comedidev, s); comedi_event(dev, s);
return; return;
} }
} }
...@@ -1745,8 +1743,6 @@ static int usbduxsigma_attach_common(struct comedi_device *dev) ...@@ -1745,8 +1743,6 @@ static int usbduxsigma_attach_common(struct comedi_device *dev)
int offset; int offset;
down(&uds->sem); down(&uds->sem);
/* pointer back to the corresponding comedi device */
uds->comedidev = dev;
/* set number of subdevices */ /* set number of subdevices */
if (uds->high_speed) if (uds->high_speed)
...@@ -1993,7 +1989,6 @@ static void usbduxsigma_detach(struct comedi_device *dev) ...@@ -1993,7 +1989,6 @@ static void usbduxsigma_detach(struct comedi_device *dev)
usbdux_ao_stop(devpriv, devpriv->ao_cmd_running); usbdux_ao_stop(devpriv, devpriv->ao_cmd_running);
down(&devpriv->sem); down(&devpriv->sem);
devpriv->comedidev = NULL;
tidy_up(devpriv); tidy_up(devpriv);
up(&devpriv->sem); up(&devpriv->sem);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment