evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: pcmuio: remove 'continuous' from private data

Browse source 
This member of the private data is set based on the cmd->stop_src. Just use the
cmd->stop_src directly and remove the member.

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>
This commit is contained in:
H Hartley Sweeten 2014-09-09 16:15:57 -07:00 • committed by Greg Kroah-Hartman
parent 7173126484
commit 75d46fd781
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/comedi/drivers/pcmuio.c
View file

@ -132,7 +132,6 @@ struct pcmuio_asic {
unsigned int enabled_mask; unsigned int enabled_mask;
unsigned int stop_count; unsigned int stop_count;
unsigned int active:1; unsigned int active:1;
unsigned int continuous:1;
}; };
struct pcmuio_private { struct pcmuio_private {
@ -349,8 +348,7 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
} }
/* Check for end of acquisition. */ /* Check for end of acquisition. */
if (!chip->continuous) { if (cmd->stop_src == TRIG_COUNT) {
/* stop_src == TRIG_COUNT */
if (chip->stop_count > 0) { if (chip->stop_count > 0) {
chip->stop_count--; chip->stop_count--;
if (chip->stop_count == 0) { if (chip->stop_count == 0) {
@ -499,12 +497,10 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* Set up end of acquisition. */ /* Set up end of acquisition. */
switch (cmd->stop_src) { switch (cmd->stop_src) {
case TRIG_COUNT: case TRIG_COUNT:
chip->continuous = 0;
chip->stop_count = cmd->stop_arg; chip->stop_count = cmd->stop_arg;
break; break;
default: default:
/* TRIG_NONE */ /* TRIG_NONE */
chip->continuous = 1;
chip->stop_count = 0; chip->stop_count = 0;
break; break;
} }