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

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

staging: comedi: pcmmio: fix the cmd->start_arg use for TRIG_INT 



This driver supports a cmd->start_src of TRIG_NOW or TRIG_INT. The
cmd->start_arg is trivially validated for both sources to be 0.

For a TRIG_INT source, the cmd->start_arg is actually the valid
trig_num that is used by the async (*inttrig) callback.

Refactor the (*inttrig) function so that the cmd->start_arg is used
to check the trig_num instead of the open coded value.

For aesthetics, refactor the (*do_cmd) to use if/else instead if the
switch when handling the cmd->start_src.

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 c5588168

drivers/staging/comedi/drivers/pcmmio.c

+8 −14
Original line number Original line Diff line number Diff line
@@ -464,18 +464,16 @@ static int pcmmio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) 
	return 0;

	return 0;

}

}





/*

static int pcmmio_inttrig_start_intr(struct comedi_device *dev,

 * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice.

				     struct comedi_subdevice *s,

 */

				     unsigned int trig_num)

static int

pcmmio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s,

			  unsigned int trignum)

{

{

	struct pcmmio_private *devpriv = dev->private;

	struct pcmmio_private *devpriv = dev->private;

	struct comedi_cmd *cmd = &s->async->cmd;

	unsigned long flags;

	unsigned long flags;

	int event = 0;

	int event = 0;





	if (trignum != 0)

	if (trig_num != cmd->start_arg)

		return -EINVAL;

		return -EINVAL;





	spin_lock_irqsave(&devpriv->spinlock, flags);

	spin_lock_irqsave(&devpriv->spinlock, flags);
@@ -517,15 +515,11 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	}

	}





	/* Set up start of acquisition. */

	/* Set up start of acquisition. */

	switch (cmd->start_src) {

	if (cmd->start_src == TRIG_INT)

	case TRIG_INT:

		s->async->inttrig = pcmmio_inttrig_start_intr;

		s->async->inttrig = pcmmio_inttrig_start_intr;

		break;

	else	/* TRIG_NOW */

	default:

		/* TRIG_NOW */

		event = pcmmio_start_intr(dev, s);

		event = pcmmio_start_intr(dev, s);

		break;



	}

	spin_unlock_irqrestore(&devpriv->spinlock, flags);

	spin_unlock_irqrestore(&devpriv->spinlock, flags);





	if (event)

	if (event)