Skip to content

Commit

Permalink
staging: comedi: adv_pci1710: use cfc_check_trigger_is_unique
Browse files Browse the repository at this point in the history
Use the helper function cfc_check_trigger_is_unique for the "step 2a"
tests of pci171x_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 12, 2012
1 parent 85f3088 commit b7f16de
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -1057,18 +1057,13 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
if (err)
return 1;

/* step2: make sure trigger srcs are unique and mutually compatible */
/* step 2a: make sure trigger sources are unique */

if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) {
cmd->start_src = TRIG_NOW;
err++;
}
err |= cfc_check_trigger_is_unique(cmd->start_src);
err |= cfc_check_trigger_is_unique(cmd->convert_src);
err |= cfc_check_trigger_is_unique(cmd->stop_src);

if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT)
err++;

if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
err++;
/* step 2b: and mutually compatible */

if (err)
return 2;
Expand Down

0 comments on commit b7f16de

Please sign in to comment.