From: H Hartley Sweeten Date: Tue, 11 Sep 2012 22:09:39 +0000 (-0700) Subject: staging: comedi: adv_pci1710: use cfc_check_trigger_is_unique X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b7f16de6a4fc15b07d0ec86fdc78b1093dd07f52;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 6fbf566d84a1..0fd0210625f6 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;