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

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

staging: comedi: gsc_hpdi: factor out chanlist checking from (*do_cmdtest) 



Step 5 of the (*do_cmdtest) validates that the cmd->chanlist is compatible
with the hardware.

For aesthetics, factor out the step 5 code for the async command support. Tidy
up the factored out code.

To minimize the noise, change the dev_err() to dev_dbg().

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 86914996

drivers/staging/comedi/drivers/gsc_hpdi.c

+22 −12
Original line number Diff line number Diff line
@@ -360,12 +360,30 @@ static int gsc_hpdi_cmd(struct comedi_device *dev, 
	return 0;

}



static int gsc_hpdi_check_chanlist(struct comedi_device *dev,

				   struct comedi_subdevice *s,

				   struct comedi_cmd *cmd)

{

	int i;



	for (i = 0; i < cmd->chanlist_len; i++) {

		unsigned int chan = CR_CHAN(cmd->chanlist[i]);



		if (chan != i) {

			dev_dbg(dev->class_dev,

				"chanlist must be ch 0 to 31 in order\n");

			return -EINVAL;

		}

	}



	return 0;

}



static int gsc_hpdi_cmd_test(struct comedi_device *dev,

			     struct comedi_subdevice *s,

			     struct comedi_cmd *cmd)

{

	int err = 0;

	int i;



	if (s->io_bits)

		return -EINVAL;
@@ -411,17 +429,9 @@ static int gsc_hpdi_cmd_test(struct comedi_device *dev, 
	if (err)

		return 4;



	/* step 5: complain about special chanlist considerations */



	for (i = 0; i < cmd->chanlist_len; i++) {

		if (CR_CHAN(cmd->chanlist[i]) != i) {

			/*  XXX could support 8 or 16 channels */

			dev_err(dev->class_dev,

				"chanlist must be ch 0 to 31 in order");

			err |= -EINVAL;

			break;

		}

	}

	/* Step 5: check channel list if it exists */

	if (cmd->chanlist && cmd->chanlist_len > 0)

		err |= gsc_hpdi_check_chanlist(dev, s, cmd);



	if (err)

		return 5;