From 15be6ed008c86ee0f1daa6f21e703a4e0cadf1d3 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 13 Nov 2012 17:57:42 -0700 Subject: [PATCH] --- yaml --- r: 337927 b: refs/heads/master c: d1e27594ed307e96637dc26c9c7f643ab86aff88 h: refs/heads/master i: 337925: 94be69bf8bb47cf9266f0acebdd6c097acfbd7a3 337923: 193e43fdb776e11c93b70cec9bf46970b93a4d76 337919: 69910e8087cd05a8058aafc312ec50b7273ccc8a v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl711.c | 36 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index cd88695fca9d..00b3e4203827 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aadd0132c5ac794415690b5ef95fd4da986fec78 +refs/heads/master: d1e27594ed307e96637dc26c9c7f643ab86aff88 diff --git a/trunk/drivers/staging/comedi/drivers/pcl711.c b/trunk/drivers/staging/comedi/drivers/pcl711.c index f9c15aa45fea..6ee5da24a961 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl711.c +++ b/trunk/drivers/staging/comedi/drivers/pcl711.c @@ -289,38 +289,24 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev, if (err) return 2; - /* step 3 */ + /* Step 3: check if arguments are trivially valid */ + + err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0); - if (cmd->start_arg != 0) { - cmd->start_arg = 0; - err++; - } if (cmd->scan_begin_src == TRIG_EXT) { - if (cmd->scan_begin_arg != 0) { - cmd->scan_begin_arg = 0; - err++; - } + err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0); } else { #define MAX_SPEED 1000 #define TIMER_BASE 100 - if (cmd->scan_begin_arg < MAX_SPEED) { - cmd->scan_begin_arg = MAX_SPEED; - err++; - } - } - if (cmd->convert_arg != 0) { - cmd->convert_arg = 0; - err++; - } - if (cmd->scan_end_arg != cmd->chanlist_len) { - cmd->scan_end_arg = cmd->chanlist_len; - err++; + err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, + MAX_SPEED); } + + err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0); + err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len); + if (cmd->stop_src == TRIG_NONE) { - if (cmd->stop_arg != 0) { - cmd->stop_arg = 0; - err++; - } + err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0); } else { /* ignore */ }