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

staging: comedi: comedi_fc: rename comedi_subdevice variables in header

Typically the comedi_subdevice variable is simply named 's'. Rename
the variables in comedi_fc.h.
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 8af9dd12
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *, unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *,
void *data, unsigned int num_bytes); void *data, unsigned int num_bytes);
static inline unsigned int cfc_write_to_buffer(struct comedi_subdevice *subd, static inline unsigned int cfc_write_to_buffer(struct comedi_subdevice *s,
unsigned short data) unsigned short data)
{ {
return cfc_write_array_to_buffer(subd, &data, sizeof(data)); return cfc_write_array_to_buffer(s, &data, sizeof(data));
}; };
static inline unsigned int cfc_write_long_to_buffer(struct comedi_subdevice static inline unsigned int cfc_write_long_to_buffer(struct comedi_subdevice *s,
*subd, unsigned int data) unsigned int data)
{ {
return cfc_write_array_to_buffer(subd, &data, sizeof(data)); return cfc_write_array_to_buffer(s, &data, sizeof(data));
}; };
unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *, unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *,
...@@ -45,24 +45,24 @@ unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *, ...@@ -45,24 +45,24 @@ unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *,
unsigned int cfc_handle_events(struct comedi_device *, unsigned int cfc_handle_events(struct comedi_device *,
struct comedi_subdevice *); struct comedi_subdevice *);
static inline unsigned int cfc_bytes_per_scan(struct comedi_subdevice *subd) static inline unsigned int cfc_bytes_per_scan(struct comedi_subdevice *s)
{ {
int num_samples; int num_samples;
int bits_per_sample; int bits_per_sample;
switch (subd->type) { switch (s->type) {
case COMEDI_SUBD_DI: case COMEDI_SUBD_DI:
case COMEDI_SUBD_DO: case COMEDI_SUBD_DO:
case COMEDI_SUBD_DIO: case COMEDI_SUBD_DIO:
bits_per_sample = 8 * bytes_per_sample(subd); bits_per_sample = 8 * bytes_per_sample(s);
num_samples = (subd->async->cmd.chanlist_len + num_samples = (s->async->cmd.chanlist_len +
bits_per_sample - 1) / bits_per_sample; bits_per_sample - 1) / bits_per_sample;
break; break;
default: default:
num_samples = subd->async->cmd.chanlist_len; num_samples = s->async->cmd.chanlist_len;
break; break;
} }
return num_samples * bytes_per_sample(subd); return num_samples * bytes_per_sample(s);
} }
/** /**
......
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