[PATCH 03/23] staging: comedi: das16m1: don't calc pacer divisors twice

[Ian Abbott]

On 2014-04-28 19:53, H Hartley Sweeten wrote:
> The analog input async command can use the pacer for the convert_src. The
> (*do_cmdtest) calculates the divisors when validating the cmd argument.
>
> There is no reason to recalc the divisors in the (*do_cmd). Just use the
> values from the private data.
>
> Also, tidy up das16m1_set_pacer() and das16m1_cmd_exec() a bit.
>
> Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
> Cc: Ian Abbott <abbotti at mev.co.uk>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>   drivers/staging/comedi/drivers/das16m1.c | 42 +++++++++++---------------------
>   1 file changed, 14 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
> index a9cd210..2b51a00 100644
> --- a/drivers/staging/comedi/drivers/das16m1.c
> +++ b/drivers/staging/comedi/drivers/das16m1.c
> @@ -254,26 +254,15 @@ static int das16m1_cmd_test(struct comedi_device *dev,
>   	return 0;
>   }
>
> -/* This function takes a time in nanoseconds and sets the     *
> - * 2 pacer clocks to the closest frequency possible. It also  *
> - * returns the actual sampling period.                        */
> -static unsigned int das16m1_set_pacer(struct comedi_device *dev,
> -				      unsigned int ns, int rounding_flags)
> +static void das16m1_set_pacer(struct comedi_device *dev)
>   {
>   	struct das16m1_private_struct *devpriv = dev->private;
> +	unsigned long timer_base = dev->iobase + DAS16M1_8254_SECOND;
>
> -	i8253_cascade_ns_to_timer_2div(I8254_OSC_BASE_10MHZ,
> -				       &devpriv->divisor1,
> -				       &devpriv->divisor2,
> -				       &ns, rounding_flags);
> -
> -	/* Write the values of ctr1 and ctr2 into counters 1 and 2 */
> -	i8254_load(dev->iobase + DAS16M1_8254_SECOND, 0, 1, devpriv->divisor1,
> -		   2);
> -	i8254_load(dev->iobase + DAS16M1_8254_SECOND, 0, 2, devpriv->divisor2,
> -		   2);
> -
> -	return ns;
> +	i8254_load(timer_base, 0,
> +		   1, devpriv->divisor1, I8254_MODE2 | I8254_BINARY);
> +	i8254_load(timer_base, 0,
> +		   2, devpriv->divisor2, I8254_MODE2 | I8254_BINARY);
>   }

Mode value is wrong.

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti at mev.co.uk>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-