From ab2ca64e06972eee20e7a1e4bbf6351205bcd2fe Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Sat, 4 Jun 2022 13:05:11 +0200
Subject: [PATCH] Revert "ANDROID: timer: Add vendor hook for timer calc index"

This reverts commit 18550710107dcdd4a370ad43a8ff346074df4faa.

This causes merge conflicts with 5.19-rc1 and should not be needed
anymore.  Revert it for now and if it really is needed it can be added
back to a device-specific branch.

Bug: 178758017
Cc: Huang Yiwei <hyiwei@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id0bc0d42ae311f0af52a323fea5e58ed1b7e0bd7
---
 drivers/android/vendor_hooks.c |  2 --
 include/trace/hooks/timer.h    | 18 ------------------
 kernel/time/timer.c            |  3 ---
 3 files changed, 23 deletions(-)
 delete mode 100644 include/trace/hooks/timer.h

diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index d4d7c4540d7f..d7424d8a828e 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -28,7 +28,6 @@
 #include <trace/hooks/sys.h>
 #include <trace/hooks/iommu.h>
 #include <trace/hooks/net.h>
-#include <trace/hooks/timer.h>
 #include <trace/hooks/pm_domain.h>
 #include <trace/hooks/cpuidle_psci.h>
 #include <trace/hooks/vmscan.h>
@@ -116,7 +115,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_iommu_setup_dma_ops);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_iovad_alloc_iova);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_iovad_free_iova);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ptype_head);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_timer_calc_index);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_allow_domain_state);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_enter);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_exit);
diff --git a/include/trace/hooks/timer.h b/include/trace/hooks/timer.h
deleted file mode 100644
index 67ef865dad4a..000000000000
--- a/include/trace/hooks/timer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM timer
-
-#define TRACE_INCLUDE_PATH trace/hooks
-
-#if !defined(_TRACE_HOOK_TIMER_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_HOOK_TIMER_H
-
-#include <trace/hooks/vendor_hooks.h>
-
-DECLARE_HOOK(android_vh_timer_calc_index,
-	TP_PROTO(unsigned int lvl, unsigned long *expires),
-	TP_ARGS(lvl, expires));
-
-#endif /* _TRACE_HOOK_TIMER_H */
-/* This part must be outside protection */
-#include <trace/define_trace.h>
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 204eaabfe3ee..9dd2a39cb3b0 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -55,8 +55,6 @@
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/timer.h>
-#undef CREATE_TRACE_POINTS
-#include <trace/hooks/timer.h>
 
 __visible u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
 
@@ -505,7 +503,6 @@ static inline unsigned calc_index(unsigned long expires, unsigned lvl,
 	 * Round up with level granularity to prevent this.
 	 */
 	expires = (expires + LVL_GRAN(lvl)) >> LVL_SHIFT(lvl);
-	trace_android_vh_timer_calc_index(lvl, &expires);
 	*bucket_expiry = expires << LVL_SHIFT(lvl);
 	return LVL_OFFS(lvl) + (expires & LVL_MASK);
 }