From 9d8606b94c920927cce8712f137f713fb6f4ffe5 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Wed, 2 Sep 2020 21:04:28 -0700 Subject: [PATCH] Revert "ANDROID: vendor_hooks: Add vendor hooks for key combination" This reverts commit ab2d60d901258a91f0c714a17ab45e93e8669f04. Caused KMI break (not detected by TH until after it was merged) Signed-off-by: Todd Kjos Change-Id: If1b10072bf3758fdbb6e0e4e2cdacbcf010ab44d --- drivers/android/vendor_hooks.c | 1 - drivers/input/input.c | 3 --- include/trace/hooks/debug.h | 6 ------ 3 files changed, 10 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 0d3b4faa7bc7..7b4b1abbb537 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -55,4 +55,3 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ipi_stop); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_input_handle_event); diff --git a/drivers/input/input.c b/drivers/input/input.c index d73b76c2ad14..e2eb9b9b8363 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -26,8 +26,6 @@ #include "input-compat.h" #include "input-poller.h" -#include - MODULE_AUTHOR("Vojtech Pavlik "); MODULE_DESCRIPTION("Input core"); MODULE_LICENSE("GPL"); @@ -440,7 +438,6 @@ void input_event(struct input_dev *dev, if (is_event_supported(type, dev->evbit, EV_MAX)) { spin_lock_irqsave(&dev->event_lock, flags); - trace_android_vh_input_handle_event(dev, type, code, value); input_handle_event(dev, type, code, value); spin_unlock_irqrestore(&dev->event_lock, flags); } diff --git a/include/trace/hooks/debug.h b/include/trace/hooks/debug.h index c3bec3258c8c..d3e310ec4b2d 100644 --- a/include/trace/hooks/debug.h +++ b/include/trace/hooks/debug.h @@ -15,14 +15,8 @@ DECLARE_HOOK(android_vh_ipi_stop, TP_PROTO(struct pt_regs *regs), TP_ARGS(regs)) - -DECLARE_HOOK(android_vh_input_handle_event, - TP_PROTO(struct input_dev *dev, unsigned int type, - unsigned int code, int value), - TP_ARGS(dev, type, code, value)) #else #define trace_android_vh_ipi_stop(regs) -#define trace_android_vh_input_handle_event(dev, type, code, value) #endif #endif /* _TRACE_HOOK_DEBUG_H */