diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-11 16:55:25 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 15:33:23 -0800 |
| commit | ec1b2320009bc2a9893c7a6eef32fdced0b4455d (patch) | |
| tree | 5cc47abb27024810a5e5f22e73f5d46342383554 /drivers/staging/comedi/drivers/dmm32at.c | |
| parent | staging: comedi: dmm32at: tidy up cmd->convert_{src, arg} validation (diff) | |
| download | linux-dev-ec1b2320009bc2a9893c7a6eef32fdced0b4455d.tar.xz linux-dev-ec1b2320009bc2a9893c7a6eef32fdced0b4455d.zip | |
staging: comedi: dmm32at: remove dmm32at_ns_to_timer()
This function is not necessary. It simply returns the 'ns' value that was
passed to it.
Remove it as well as the unnecessary Step 4 check of the cmd->convert_arg.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/dmm32at.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/dmm32at.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index 637b6651e559..297338f4f46b 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c @@ -218,12 +218,6 @@ static int dmm32at_ai_insn_read(struct comedi_device *dev, return insn->n; } -static int dmm32at_ns_to_timer(unsigned int *ns, unsigned int flags) -{ - /* trivial timer */ - return *ns; -} - static int dmm32at_ai_check_chanlist(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) @@ -304,11 +298,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev, if (err) return 3; - /* step 4: fix up any arguments */ - - arg = cmd->convert_arg; - dmm32at_ns_to_timer(&arg, cmd->flags); - err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg); + /* Step 4: fix up any arguments */ arg = cmd->convert_arg * cmd->scan_end_arg; err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, arg); |