microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

staging: comedi: hwdrv_apci3120: cmd->convert_src is always TRIG_TIMER 

The (*do_cmdtest) validates that the cmd->convert_src can only be
TRIG_TIMER. Remove the unnecessay checks.

THis also simplifies the (*do_cmd) a bit since "mode 3" (whatever that
is) is never a valid mode.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-04-29 12:59:48 -07:00 коммит произвёл Greg Kroah-Hartman
Родитель 2f673c5d10
Коммит a19f716158
1 изменённых файлов: 12 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

45
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
Просмотреть файл

@ -765,15 +765,12 @@ static int apci3120_ai_cmdtest(struct comedi_device *dev,
if (cmd->scan_begin_src == TRIG_TIMER) /* Test Delay timing */ if (cmd->scan_begin_src == TRIG_TIMER) /* Test Delay timing */
err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, 100000); err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, 100000);
if (cmd->convert_src == TRIG_TIMER) { /* Test Acquisition timing */ if (cmd->scan_begin_src == TRIG_TIMER) {
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->convert_arg)
if (cmd->convert_arg)
err |= cfc_check_trigger_arg_min(
&cmd->convert_arg, 10000);
} else {
err |= cfc_check_trigger_arg_min(&cmd->convert_arg, err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
10000); 10000);
} } else {
err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 10000);
} }
err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1); err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
@ -789,15 +786,10 @@ static int apci3120_ai_cmdtest(struct comedi_device *dev,
/* step 4: fix up any arguments */ /* step 4: fix up any arguments */
if (cmd->convert_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER &&
cmd->scan_begin_arg < cmd->convert_arg * cmd->scan_end_arg) {
if (cmd->scan_begin_src == TRIG_TIMER && cmd->scan_begin_arg = cmd->convert_arg * cmd->scan_end_arg;
cmd->scan_begin_arg < err |= -EINVAL;
cmd->convert_arg * cmd->scan_end_arg) {
cmd->scan_begin_arg =
cmd->convert_arg * cmd->scan_end_arg;
err++;
}
} }
if (err) if (err)
@ -1344,23 +1336,10 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
else else
devpriv->b_ExttrigEnable = APCI3120_DISABLE; devpriv->b_ExttrigEnable = APCI3120_DISABLE;
if (cmd->scan_begin_src == TRIG_FOLLOW) { if (cmd->scan_begin_src == TRIG_FOLLOW)
/* mode 1 or 3 */ return apci3120_cyclic_ai(1, dev, s);
if (cmd->convert_src == TRIG_TIMER) { else /* TRIG_TIMER */
/* mode 1 */
/* return this_board->ai_cmd(1,dev,s); */
return apci3120_cyclic_ai(1, dev, s);
}
}
if ((cmd->scan_begin_src == TRIG_TIMER)
&& (cmd->convert_src == TRIG_TIMER)) {
/* mode 2 */
/* return this_board->ai_cmd(2,dev,s); */
return apci3120_cyclic_ai(2, dev, s); return apci3120_cyclic_ai(2, dev, s);
}
return -1;
} }
/* /*