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

staging: comedi: ni_stc.h: remove unused members from struct ni_private

Remove all the unsed members from the private data for the ni mio drivers.

The ao0p and ao1p members are only used in the ni_ao_reset() function and
the code is commented out. Remove them, and the commented out code, as well.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ffd0a782
...@@ -3136,12 +3136,6 @@ static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -3136,12 +3136,6 @@ static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s)
const struct ni_board_struct *board = comedi_board(dev); const struct ni_board_struct *board = comedi_board(dev);
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
/* devpriv->ao0p=0x0000; */
/* ni_writew(devpriv->ao0p,AO_Configuration); */
/* devpriv->ao1p=AO_Channel(1); */
/* ni_writew(devpriv->ao1p,AO_Configuration); */
ni_release_ao_mite_channel(dev); ni_release_ao_mite_channel(dev);
devpriv->stc_writew(dev, AO_Configuration_Start, Joint_Reset_Register); devpriv->stc_writew(dev, AO_Configuration_Start, Joint_Reset_Register);
......
...@@ -1428,15 +1428,8 @@ struct ni_private { ...@@ -1428,15 +1428,8 @@ struct ni_private {
unsigned short dio_output; unsigned short dio_output;
unsigned short dio_control; unsigned short dio_control;
int ao0p, ao1p;
int lastchan;
int last_do;
int rt_irq;
int irqmask;
int aimode; int aimode;
int ai_continuous; int ai_continuous;
int blocksize;
int n_left;
unsigned int ai_calib_source; unsigned int ai_calib_source;
unsigned int ai_calib_source_enabled; unsigned int ai_calib_source_enabled;
spinlock_t window_lock; spinlock_t window_lock;
...@@ -1458,7 +1451,6 @@ struct ni_private { ...@@ -1458,7 +1451,6 @@ struct ni_private {
unsigned short ao_mode3; unsigned short ao_mode3;
unsigned short ao_cmd1; unsigned short ao_cmd1;
unsigned short ao_cmd2; unsigned short ao_cmd2;
unsigned short ao_cmd3;
unsigned short ao_trigger_select; unsigned short ao_trigger_select;
struct ni_gpct_device *counter_dev; struct ni_gpct_device *counter_dev;
......
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