korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-18 20:04:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc: ioc4: Use ktime_get_ns()

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2014-07-16 21:04:43 +00:00 committed by John Stultz
parent 154adc14b1
commit 6d9b757c6c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/misc/ioc4.c
View File

@ -145,7 +145,6 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
union ioc4_int_out int_out; union ioc4_int_out int_out;
union ioc4_gpcr gpcr; union ioc4_gpcr gpcr;
unsigned int state, last_state = 1; unsigned int state, last_state = 1;
struct timespec start_ts, end_ts;
uint64_t start, end, period; uint64_t start, end, period;
unsigned int count = 0; unsigned int count = 0;
@ -174,10 +173,10 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
if (!last_state && state) { if (!last_state && state) {
count++; count++;
if (count == IOC4_CALIBRATE_END) { if (count == IOC4_CALIBRATE_END) {
ktime_get_ts(&end_ts); end = ktime_get_ns();
break; break;
} else if (count == IOC4_CALIBRATE_DISCARD) } else if (count == IOC4_CALIBRATE_DISCARD)
ktime_get_ts(&start_ts); start = ktime_get_ns();
} }
last_state = state; last_state = state;
} while (1); } 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 * by which the IOC4 generates the square wave, to get the
* period of an IOC4 INT_OUT count. * 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) / period = (end - start) /
(IOC4_CALIBRATE_CYCLES * 2 * (IOC4_CALIBRATE_COUNT + 1)); (IOC4_CALIBRATE_CYCLES * 2 * (IOC4_CALIBRATE_COUNT + 1));