Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29791cf5 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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



This member of the private data can be determined from the cmd->stop_src.
Do that instead and remove the member.

Refactor pcmmio_handle_dio_intr() to remove an indent level.

For aesthetics, change the switch in pcmmio_cmd() to an if/else.

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 aecbc172

drivers/staging/comedi/drivers/pcmmio.c

+9 −20
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ struct pcmmio_private { 
	unsigned int enabled_mask;

	unsigned int stop_count;

	unsigned int active:1;

	unsigned int continuous:1;



	unsigned int ao_readback[8];

};
@@ -371,9 +370,7 @@ static void pcmmio_handle_dio_intr(struct comedi_device *dev, 
	}



	/* Check for end of acquisition. */

	if (!devpriv->continuous) {

		/* stop_src == TRIG_COUNT */

		if (devpriv->stop_count > 0) {

	if (cmd->stop_src == TRIG_COUNT && devpriv->stop_count > 0) {

		devpriv->stop_count--;

		if (devpriv->stop_count == 0) {

			s->async->events |= COMEDI_CB_EOA;
@@ -381,7 +378,6 @@ static void pcmmio_handle_dio_intr(struct comedi_device *dev, 
			pcmmio_stop_intr(dev, s);

		}

	}

	}



done:

	spin_unlock_irqrestore(&devpriv->spinlock, flags);
@@ -421,7 +417,7 @@ static int pcmmio_start_intr(struct comedi_device *dev, 
	unsigned int pol_bits = 0;

	int i;



	if (!devpriv->continuous && devpriv->stop_count == 0) {

	if (cmd->stop_src == TRIG_COUNT && devpriv->stop_count == 0) {

		/* An empty acquisition! */

		s->async->events |= COMEDI_CB_EOA;

		devpriv->active = 0;
@@ -502,17 +498,10 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	devpriv->active = 1;



	/* Set up end of acquisition. */

	switch (cmd->stop_src) {

	case TRIG_COUNT:

		devpriv->continuous = 0;

	if (cmd->stop_src == TRIG_COUNT)

		devpriv->stop_count = cmd->stop_arg;

		break;

	default:

		/* TRIG_NONE */

		devpriv->continuous = 1;

	else	/* TRIG_NONE */

		devpriv->stop_count = 0;

		break;

	}



	/* Set up start of acquisition. */

	if (cmd->start_src == TRIG_INT)