diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-09-26 11:40:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-26 16:40:13 -0700 |
| commit | cb9cfd7ed3f6ed4c40167b4251cdb382b6b3ba1c (patch) | |
| tree | 78aa9b8f1bd856b24b91e834580f3aa9531f703e /drivers/staging/comedi/drivers/pcl711.c | |
| parent | fa57560c5d4d58591dda2b160731eb4da3619016 (diff) | |
staging: comedi: 8253.h: tidy up the i8253_cascade_ns_to_timer*() users
Introduce a couple defines for the common 8254 oscillator base values
used in the comedi drivers and remove the custom defines and open
coded values.
Change the i8253_cascade_ns_to_timer_2div() calls in the drivers to
the more generic i8253_cascade_ns_to_timer(). They are identical due
to the #define in the 8253.h header.
Remove the extra mask by TRIG_ROUND_MASK of the 'round_mode' parameter
to i8253_cascade_ns_to_timer(). That function already handles the mask.
Tidy up all the calls to i8253_cascade_ns_to_timer().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/pcl711.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl711.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index e170f8aeef5f..89982fb52e50 100644 --- a/drivers/staging/comedi/drivers/pcl711.c +++ b/drivers/staging/comedi/drivers/pcl711.c @@ -349,11 +349,11 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev, if (cmd->scan_begin_src == TRIG_TIMER) { tmp = cmd->scan_begin_arg; - i8253_cascade_ns_to_timer(500, /* 2 Mhz */ + i8253_cascade_ns_to_timer(I8254_OSC_BASE_2MHZ, &devpriv->divisor1, &devpriv->divisor2, &cmd->scan_begin_arg, - cmd->flags & TRIG_ROUND_MASK); + cmd->flags); if (tmp != cmd->scan_begin_arg) err++; } |