diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 23:04:25 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-07-23 19:18:02 +0200 |
| commit | 5cac2f4d1c5f3eb3d981fab85d926d19f7b6b889 (patch) | |
| tree | 452262d230e4b5a2df67e4c908815f8ffc8b63f4 /drivers/input/evdev.c | |
| parent | timerfd: Use ktime_mono_to_real() (diff) | |
| download | linux-5cac2f4d1c5f3eb3d981fab85d926d19f7b6b889.tar.xz linux-5cac2f4d1c5f3eb3d981fab85d926d19f7b6b889.zip | |
input: evdev: Use ktime_mono_to_real()
Convert the monotonic timestamp with ktime_mono_to_real() in
evdev_events().
In evdev_queue_syn_dropped() we can call either ktime_get() or
ktime_get_real() depending on the clkid. No point in having two calls
for CLOCK_REALTIME.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index fd325ec9f064..de055451d1af 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -108,9 +108,8 @@ static void evdev_queue_syn_dropped(struct evdev_client *client) struct input_event ev; ktime_t time; - time = ktime_get(); - if (client->clkid != CLOCK_MONOTONIC) - time = ktime_sub(time, ktime_get_monotonic_offset()); + time = (client->clkid == CLOCK_MONOTONIC) ? + ktime_get() : ktime_get_real(); ev.time = ktime_to_timeval(time); ev.type = EV_SYN; @@ -202,7 +201,7 @@ static void evdev_events(struct input_handle *handle, ktime_t time_mono, time_real; time_mono = ktime_get(); - time_real = ktime_sub(time_mono, ktime_get_monotonic_offset()); + time_real = ktime_mono_to_real(time_mono); rcu_read_lock(); |