diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-11 15:09:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-12 09:29:22 -0700 |
| commit | b7f16de6a4fc15b07d0ec86fdc78b1093dd07f52 (patch) | |
| tree | 4978655345aa2b65c112920b29443ab406aa61e9 | |
| parent | 85f3088b848900a1c904dde2ae6505ecad399910 (diff) | |
staging: comedi: adv_pci1710: use cfc_check_trigger_is_unique
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1710.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 6fbf566d84a..0fd0210625f 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -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; |