Skip to content

Commit

Permalink
staging: comedi: adl_pci9111: 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.

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 11, 2012
1 parent 6c39eed commit e990333
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -366,27 +366,22 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev,
if (error)
return 1;

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

if ((cmd->scan_begin_src != TRIG_TIMER) &&
(cmd->scan_begin_src != TRIG_FOLLOW) &&
(cmd->scan_begin_src != TRIG_EXT))
error++;
error |= cfc_check_trigger_is_unique(cmd->scan_begin_src);
error |= cfc_check_trigger_is_unique(cmd->convert_src);
error |= cfc_check_trigger_is_unique(cmd->stop_src);

/* Step 2b : and mutually compatible */

if ((cmd->convert_src != TRIG_TIMER) && (cmd->convert_src != TRIG_EXT))
error++;
if ((cmd->convert_src == TRIG_TIMER) &&
!((cmd->scan_begin_src == TRIG_TIMER) ||
(cmd->scan_begin_src == TRIG_FOLLOW)))
error++;
error |= -EINVAL;
if ((cmd->convert_src == TRIG_EXT) &&
!((cmd->scan_begin_src == TRIG_EXT) ||
(cmd->scan_begin_src == TRIG_FOLLOW)))
error++;

if ((cmd->stop_src != TRIG_COUNT) && (cmd->stop_src != TRIG_NONE))
error++;
error |= -EINVAL;

if (error)
return 2;
Expand Down

0 comments on commit e990333

Please sign in to comment.