diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-05-29 17:56:31 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-18 21:56:44 (GMT) |
| commit | 9588fa8fe908c5501de5076de9a0c9d44ef737ec (patch) | |
| tree | 94c41796392041b05ed58a6eb8cce1fab07049a1 /drivers/staging/comedi | |
| parent | ffd0a782bae3ac8355963a1c2e8028a73c666018 (diff) | |
| download | linux-9588fa8fe908c5501de5076de9a0c9d44ef737ec.tar.xz | |
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 6 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 68cd92b..45c4208 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -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); 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); devpriv->stc_writew(dev, AO_Configuration_Start, Joint_Reset_Register); diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index a09f3cd..1cc035b 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -1428,15 +1428,8 @@ struct ni_private { unsigned short dio_output; unsigned short dio_control; - int ao0p, ao1p; - int lastchan; - int last_do; - int rt_irq; - int irqmask; int aimode; int ai_continuous; - int blocksize; - int n_left; unsigned int ai_calib_source; unsigned int ai_calib_source_enabled; spinlock_t window_lock; @@ -1458,7 +1451,6 @@ struct ni_private { unsigned short ao_mode3; unsigned short ao_cmd1; unsigned short ao_cmd2; - unsigned short ao_cmd3; unsigned short ao_trigger_select; struct ni_gpct_device *counter_dev; |