From 171ace325c6c567f26e39f2874b700f09a24bd3a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 31 Mar 2023 10:42:38 +0000 Subject: [PATCH] Revert "ANDROID: cpufreq: Add a restricted vendor hook for freq transition" This reverts commit d723168991c1980f75000114fc72691007a98946. The hook it added: android_rvh_cpufreq_transition is not used by anyone, so remove it. If it is needed in the future it can be submitted for review again. Bug: 181889516 Cc: Pavankumar Kondeti Change-Id: I770ef330c0e1e6095b74c0a22845f20b4b71fd70 Signed-off-by: Greg Kroah-Hartman --- drivers/android/vendor_hooks.c | 1 - drivers/cpufreq/cpufreq.c | 2 -- include/trace/hooks/cpufreq.h | 4 ---- 3 files changed, 7 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index bc286978d5bc..fa470ab1ffb7 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -74,7 +74,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_wait_for_work); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sync_txn_recvd); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpufreq_transition); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_balance_anon_file_reclaim); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_show_max_freq); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_selinux_avc_insert); diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 493306027966..afdb392d4e67 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -391,7 +391,6 @@ static void cpufreq_notify_transition(struct cpufreq_policy *policy, cpufreq_stats_record_transition(policy, freqs->new); cpufreq_times_record_transition(policy, freqs->new); policy->cur = freqs->new; - trace_android_rvh_cpufreq_transition(policy); } } @@ -2140,7 +2139,6 @@ unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy, arch_set_freq_scale(policy->related_cpus, freq, policy->cpuinfo.max_freq); cpufreq_stats_record_transition(policy, freq); - trace_android_rvh_cpufreq_transition(policy); if (trace_cpu_frequency_enabled()) { for_each_cpu(cpu, policy->cpus) diff --git a/include/trace/hooks/cpufreq.h b/include/trace/hooks/cpufreq.h index 3c9fdeb700bc..e37d972c4d5c 100644 --- a/include/trace/hooks/cpufreq.h +++ b/include/trace/hooks/cpufreq.h @@ -20,10 +20,6 @@ DECLARE_HOOK(android_vh_freq_table_limits, unsigned int max_freq), TP_ARGS(policy, min_freq, max_freq)); -DECLARE_RESTRICTED_HOOK(android_rvh_cpufreq_transition, - TP_PROTO(struct cpufreq_policy *policy), - TP_ARGS(policy), 1); - #endif /* _TRACE_HOOK_CPUFREQ_H */ /* This part must be outside protection */ #include