aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-03-01 11:33:34 -0500
committerIngo Molnar <mingo@kernel.org>2018-03-13 02:34:22 -0400
commitf2d6fdbfd2389a38598d448cb8dc09d946c1b87e (patch)
tree32cd6a08fdbec9a6cbb3cc1d79b6415679b7efef
parentd6ed449afdb38f89a7b38ec50e367559e1b8f71f (diff)
Input: Evdev - unify MONOTONIC and BOOTTIME clock behavior
Now that the MONOTONIC and BOOTTIME clocks are indentical, remove all the special casing. The user space visible interfaces still support both clocks, but their behavior is identical. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Kevin Easton <kevin@guarana.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mark Salyzyn <salyzyn@android.com> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Petr Mladek <pmladek@suse.com> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: linux-input@vger.kernel.org Link: http://lkml.kernel.org/r/20180301165150.155899327@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--drivers/input/evdev.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index c81c79d01d93..46115a392098 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -31,7 +31,6 @@
31enum evdev_clock_type { 31enum evdev_clock_type {
32 EV_CLK_REAL = 0, 32 EV_CLK_REAL = 0,
33 EV_CLK_MONO, 33 EV_CLK_MONO,
34 EV_CLK_BOOT,
35 EV_CLK_MAX 34 EV_CLK_MAX
36}; 35};
37 36
@@ -198,12 +197,10 @@ static int evdev_set_clk_type(struct evdev_client *client, unsigned int clkid)
198 case CLOCK_REALTIME: 197 case CLOCK_REALTIME:
199 clk_type = EV_CLK_REAL; 198 clk_type = EV_CLK_REAL;
200 break; 199 break;
200 case CLOCK_BOOTTIME:
201 case CLOCK_MONOTONIC: 201 case CLOCK_MONOTONIC:
202 clk_type = EV_CLK_MONO; 202 clk_type = EV_CLK_MONO;
203 break; 203 break;
204 case CLOCK_BOOTTIME:
205 clk_type = EV_CLK_BOOT;
206 break;
207 default: 204 default:
208 return -EINVAL; 205 return -EINVAL;
209 } 206 }
@@ -314,8 +311,6 @@ static void evdev_events(struct input_handle *handle,
314 311
315 ev_time[EV_CLK_MONO] = ktime_get(); 312 ev_time[EV_CLK_MONO] = ktime_get();
316 ev_time[EV_CLK_REAL] = ktime_mono_to_real(ev_time[EV_CLK_MONO]); 313 ev_time[EV_CLK_REAL] = ktime_mono_to_real(ev_time[EV_CLK_MONO]);
317 ev_time[EV_CLK_BOOT] = ktime_mono_to_any(ev_time[EV_CLK_MONO],
318 TK_OFFS_BOOT);
319 314
320 rcu_read_lock(); 315 rcu_read_lock();
321 316