iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: 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-04-16 14:19:17 -07:00 committed by Greg Kroah-Hartman
parent 8691499619
commit 198b21c642
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/comedi/drivers/gsc_hpdi.c
View File

@ -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;