diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-04-29 12:59:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-03 20:06:31 -0400 |
| commit | d33f88581d2bb06470cb12eb048d70ebdec6fee2 (patch) | |
| tree | 6811d59291033b2926411b9895f874830feae115 | |
| parent | 1265c22fc8575e857f0a0573db263b507988f420 (diff) | |
| download | linux-d33f88581d2bb06470cb12eb048d70ebdec6fee2.tar.gz linux-d33f88581d2bb06470cb12eb048d70ebdec6fee2.tar.bz2 linux-d33f88581d2bb06470cb12eb048d70ebdec6fee2.zip | |
staging: comedi: 8253.h: rename i8253_cascade_ns_to_timer_2div()
All of the comedi drivers use the i8253_cascade_ns_to_timer macro
when calculating the divisors for the cascaded timers. This macro
just causes the i8253_cascade_ns_to_timer_2div() inline to be used.
Rename i8253_cascade_ns_to_timer_2div() and remove the macro.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/8253.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/8253.h b/drivers/staging/comedi/drivers/8253.h index e3d737cf7302..88cd6f251dcc 100644 --- a/drivers/staging/comedi/drivers/8253.h +++ b/drivers/staging/comedi/drivers/8253.h @@ -30,8 +30,6 @@ #define I8254_OSC_BASE_2MHZ 500 #define I8254_OSC_BASE_1MHZ 1000 -#define i8253_cascade_ns_to_timer i8253_cascade_ns_to_timer_2div - static inline void i8253_cascade_ns_to_timer_2div_old(int i8253_osc_base, unsigned int *d1, unsigned int *d2, @@ -125,11 +123,11 @@ static inline void i8253_cascade_ns_to_timer_power(int i8253_osc_base, *d2 = div2 & 0xffff; } -static inline void i8253_cascade_ns_to_timer_2div(int i8253_osc_base, - unsigned int *d1, - unsigned int *d2, - unsigned int *nanosec, - int round_mode) +static inline void i8253_cascade_ns_to_timer(int i8253_osc_base, + unsigned int *d1, + unsigned int *d2, + unsigned int *nanosec, + int round_mode) { unsigned int divider; unsigned int div1, div2; |