Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1b2320 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85b0e766

drivers/staging/comedi/drivers/dmm32at.c

+1 −11
Original line number Diff line number Diff line
@@ -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);