From bb168ca1805b33289aae802a940551dec93a24d3 Mon Sep 17 00:00:00 2001 From: Changki Kim Date: Fri, 11 Sep 2020 11:37:52 +0900 Subject: [PATCH] Revert "ANDROID: vendor_hooks: Add vendor hooks for key combination" This reverts commit 72f2bc5fc24c8980315f9177db3b391036c4174f. You can use input_handle_event instead of this vendor hook. Change-Id: I8c6c5705f07181710c99a01239d75ecf43f9c5bf Signed-off-by: Changki Kim --- drivers/android/vendor_hooks.c | 1 - drivers/input/input.c | 5 ----- include/trace/hooks/debug.h | 8 -------- 3 files changed, 14 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 6434e0aec875..e2eb9b9b8363 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -26,10 +26,6 @@ #include "input-compat.h" #include "input-poller.h" -#ifndef __GENKSYMS__ -#include -#endif - MODULE_AUTHOR("Vojtech Pavlik "); MODULE_DESCRIPTION("Input core"); MODULE_LICENSE("GPL"); @@ -442,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 d3127643ece8..99ae33889b0d 100644 --- a/include/trace/hooks/debug.h +++ b/include/trace/hooks/debug.h @@ -11,20 +11,12 @@ #include #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) - struct pt_regs; DECLARE_HOOK(android_vh_ipi_stop, TP_PROTO(struct pt_regs *regs), TP_ARGS(regs)) - -struct input_dev; -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 */