misc: ioc4: Use ktime_get_ns()
authorThomas Gleixner <tglx@linutronix.de>
Wed, 16 Jul 2014 21:04:43 +0000 (21:04 +0000)
committerJohn Stultz <john.stultz@linaro.org>
Wed, 23 Jul 2014 22:01:43 +0000 (15:01 -0700)
Replace the ever recurring:
        ts = ktime_get_ts();
        ns = timespec_to_ns(&ts);
with
        ns = ktime_get_ns();

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
drivers/misc/ioc4.c

index 06f6ad29ceff294a67cb34c10f88b2a1f1e6e78a..3336ddca45acc7e775794e4b239d2da113f354ef 100644 (file)
@@ -145,7 +145,6 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
        union ioc4_int_out int_out;
        union ioc4_gpcr gpcr;
        unsigned int state, last_state = 1;
-       struct timespec start_ts, end_ts;
        uint64_t start, end, period;
        unsigned int count = 0;
 
@@ -174,10 +173,10 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
                if (!last_state && state) {
                        count++;
                        if (count == IOC4_CALIBRATE_END) {
-                               ktime_get_ts(&end_ts);
+                               end = ktime_get_ns();
                                break;
                        } else if (count == IOC4_CALIBRATE_DISCARD)
-                               ktime_get_ts(&start_ts);
+                               start = ktime_get_ns();
                }
                last_state = state;
        } while (1);
@@ -192,8 +191,6 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
         *    by which the IOC4 generates the square wave, to get the
         *    period of an IOC4 INT_OUT count.
         */
-       end = end_ts.tv_sec * NSEC_PER_SEC + end_ts.tv_nsec;
-       start = start_ts.tv_sec * NSEC_PER_SEC + start_ts.tv_nsec;
        period = (end - start) /
                (IOC4_CALIBRATE_CYCLES * 2 * (IOC4_CALIBRATE_COUNT + 1));