Skip to content

Commit

Permalink
staging: comedi: ni_stc.h: remove unused members from struct ni_private
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
bigguiness authored and gregkh committed Jun 18, 2014
1 parent ffd0a78 commit 9588fa8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
6 changes: 0 additions & 6 deletions drivers/staging/comedi/drivers/ni_mio_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions drivers/staging/comedi/drivers/ni_stc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 9588fa8

Please sign in to comment.