From 519b8651aaf6784a00935519bb68c3fae6e8f8e4 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 25 Oct 2024 17:19:49 +0000 Subject: [PATCH] ANDROID: remove unused vendor hooks These two vendor hooks were not used by any partner in android15-6.6 or android14-6.1: android_vh_freq_table_limits android_vh_gic_v3_affinity_init Removing from android-mainline Bug: 375463847 Signed-off-by: Todd Kjos Change-Id: I6ac0bd9a70975db079ad56623da990c19cf58eda --- drivers/android/vendor_hooks.c | 2 -- drivers/cpufreq/freq_table.c | 1 - drivers/irqchip/irq-gic-v3.c | 8 ++------ include/trace/hooks/cpufreq.h | 5 ----- include/trace/hooks/gic_v3.h | 3 --- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 954e63e30fde..1accde973427 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -52,7 +52,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_printk_caller); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_printk_ext_header); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_suspend_epoch_val); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_resume_epoch_val); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_table_limits); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpufreq_online); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_attach); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_online); @@ -89,7 +88,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_revert_creds); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_mmap_file); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_file_open); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_gic_set_affinity); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_gic_v3_affinity_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_bpf_syscall); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rproc_recovery); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rproc_recovery_set); diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c index e804c9dd3e4a..07bacf08e250 100644 --- a/drivers/cpufreq/freq_table.c +++ b/drivers/cpufreq/freq_table.c @@ -52,7 +52,6 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy, max_freq = freq; } - trace_android_vh_freq_table_limits(policy, min_freq, max_freq); policy->min = policy->cpuinfo.min_freq = min_freq; policy->max = max_freq; /* diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 050bff49731f..7f892a5ad37b 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -993,15 +993,11 @@ static void __init gic_dist_init(void) * enabled. */ affinity = gic_cpu_to_affinity(smp_processor_id()); - for (i = 32; i < GIC_LINE_NR; i++) { - trace_android_vh_gic_v3_affinity_init(i, GICD_IROUTER, &affinity); + for (i = 32; i < GIC_LINE_NR; i++) gic_write_irouter(affinity, base + GICD_IROUTER + i * 8); - } - for (i = 0; i < GIC_ESPI_NR; i++) { - trace_android_vh_gic_v3_affinity_init(i, GICD_IROUTERnE, &affinity); + for (i = 0; i < GIC_ESPI_NR; i++) gic_write_irouter(affinity, base + GICD_IROUTERnE + i * 8); - } } static int gic_iterate_rdists(int (*fn)(struct redist_region *, void __iomem *)) diff --git a/include/trace/hooks/cpufreq.h b/include/trace/hooks/cpufreq.h index 77443b3bb642..1f148ed8d45d 100644 --- a/include/trace/hooks/cpufreq.h +++ b/include/trace/hooks/cpufreq.h @@ -15,11 +15,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_show_max_freq, TP_PROTO(struct cpufreq_policy *policy, unsigned int *max_freq), TP_ARGS(policy, max_freq), 1); -DECLARE_HOOK(android_vh_freq_table_limits, - TP_PROTO(struct cpufreq_policy *policy, unsigned int min_freq, - unsigned int max_freq), - TP_ARGS(policy, min_freq, max_freq)); - DECLARE_HOOK(android_vh_cpufreq_online, TP_PROTO(struct cpufreq_policy *policy), TP_ARGS(policy)); diff --git a/include/trace/hooks/gic_v3.h b/include/trace/hooks/gic_v3.h index 0f81993df161..54368d65b319 100644 --- a/include/trace/hooks/gic_v3.h +++ b/include/trace/hooks/gic_v3.h @@ -14,9 +14,6 @@ */ struct irq_data; struct cpumask; -DECLARE_HOOK(android_vh_gic_v3_affinity_init, - TP_PROTO(int irq, u32 offset, u64 *affinity), - TP_ARGS(irq, offset, affinity)); DECLARE_RESTRICTED_HOOK(android_rvh_gic_v3_set_affinity, TP_PROTO(struct irq_data *d, const struct cpumask *mask_val, u64 *affinity, bool force, void __iomem *base,