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

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

staging: comedi: cb_pcidas64: change params to external_ai_queue_in_use() 



The caller already has the comedi_subdevice and comedi_cmd pointers. Pass
those variables to the helper function.

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 421ab41b

drivers/staging/comedi/drivers/cb_pcidas64.c

+6 −4
Original line number Diff line number Diff line
@@ -3205,15 +3205,17 @@ static int prep_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd) 
	return 0;

}



static inline int external_ai_queue_in_use(struct comedi_device *dev)

static inline int external_ai_queue_in_use(struct comedi_device *dev,

					   struct comedi_subdevice *s,

					   struct comedi_cmd *cmd)

{

	const struct pcidas64_board *thisboard = comedi_board(dev);



	if (dev->read_subdev->busy)

	if (s->busy)

		return 0;

	if (thisboard->layout == LAYOUT_4020)

		return 0;

	else if (use_internal_queue_6xxx(&dev->read_subdev->async->cmd))

	else if (use_internal_queue_6xxx(cmd))

		return 0;

	return 1;

}
@@ -3247,7 +3249,7 @@ static int ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	struct pcidas64_private *devpriv = dev->private;

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



	if (external_ai_queue_in_use(dev)) {

	if (external_ai_queue_in_use(dev, s, cmd)) {

		warn_external_queue(dev);

		return -EBUSY;

	}