Skip to content

Commit

Permalink
staging: comedi: remove 'settling_time_0' from subdevice
Browse files Browse the repository at this point in the history
The `settling_time_0` member of `struct comedi_subdevice` can be set by
a low-level comedi driver and will be copied to user-space as part of
the information provided by the `COMEDI_SUBDINFO` ioctl.  No comedi
driver has ever set it; it's just been left at its initial value of 0.
Remove it to save a bit of space, and behave as though it is 0.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Oct 8, 2013
1 parent 64d9b1d commit cd94d28
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -826,8 +826,6 @@ static int do_subdinfo_ioctl(struct comedi_device *dev,
us->insn_bits_support = COMEDI_SUPPORTED;
else
us->insn_bits_support = COMEDI_UNSUPPORTED;

us->settling_time_0 = s->settling_time_0;
}

ret = copy_to_user(arg, tmp, dev->n_subdevices * sizeof(*tmp));
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/comedidev.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ struct comedi_subdevice {
unsigned int maxdata; /* if maxdata==0, use list */
const unsigned int *maxdata_list; /* list is channel specific */

unsigned int settling_time_0;

const struct comedi_lrange *range_table;
const struct comedi_lrange *const *range_table_list;

Expand Down

0 comments on commit cd94d28

Please sign in to comment.