korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 23:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: pcl818: use comedi_fc helpers to validate timer arg

Browse Source 
Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

The minimum test is not needed, this was already validated in Step 3.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

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-05-27 10:12:56 -07:00 committed by Greg Kroah-Hartman
parent e4d18fe6b4
commit 863731fd6f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/comedi/drivers/pcl818.c
View File

@ -741,7 +741,7 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
const struct pcl818_board *board = comedi_board(dev); const struct pcl818_board *board = comedi_board(dev);
struct pcl818_private *devpriv = dev->private; struct pcl818_private *devpriv = dev->private;
int err = 0; int err = 0;
int tmp; unsigned int arg;
/* Step 1 : check if triggers are trivially valid */ /* Step 1 : check if triggers are trivially valid */
@ -788,15 +788,12 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
/* step 4: fix up any arguments */ /* step 4: fix up any arguments */
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
tmp = cmd->convert_arg; arg = cmd->convert_arg;
i8253_cascade_ns_to_timer(devpriv->i8253_osc_base, i8253_cascade_ns_to_timer(devpriv->i8253_osc_base,
&devpriv->divisor1, &devpriv->divisor1,
&devpriv->divisor2, &devpriv->divisor2,
&cmd->convert_arg, cmd->flags); &arg, cmd->flags);
if (cmd->convert_arg < board->ns_min) err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);
cmd->convert_arg = board->ns_min;
if (tmp != cmd->convert_arg)
err++;
} }
if (err) if (err)