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>

diff --git a/drivers/staging/comedi/drivers/8253.h b/drivers/staging/comedi/drivers/8253.h
index e3d737c..88cd6f2 100644 (file)
--- 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;