From aa381a5c71469188ea57ff86f511341c66cdf285 Mon Sep 17 00:00:00 2001
From: Todd Kjos <tkjos@google.com>
Date: Wed, 7 Sep 2022 13:25:46 -0700
Subject: [PATCH] ANDROID: remove CONFIG_TRACEPOINTS from hook definition
 headers

Remove the obsolete use of CONFIG_TRACEPOINTS in hook definition
header files. The !CONFIG_TRACEPOINTS case is correctly handled
by the included trace header files.

Bug: 233047575
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I957649bcfef375284f2885cf732ff2960c303837
---
 include/trace/hooks/debug.h   | 5 -----
 include/trace/hooks/gpiolib.h | 4 ----
 include/trace/hooks/iommu.h   | 8 --------
 include/trace/hooks/psi.h     | 7 -------
 4 files changed, 24 deletions(-)

diff --git a/include/trace/hooks/debug.h b/include/trace/hooks/debug.h
index 892c60ac6f34..58ec198ceb6d 100644
--- a/include/trace/hooks/debug.h
+++ b/include/trace/hooks/debug.h
@@ -9,7 +9,6 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 #ifdef __GENKSYMS__
 struct pt_regs;
 #else
@@ -20,10 +19,6 @@ struct pt_regs;
 DECLARE_HOOK(android_vh_ipi_stop,
 	TP_PROTO(struct pt_regs *regs),
 	TP_ARGS(regs))
-#else
-#define trace_android_vh_ipi_stop(regs)
-#define trace_android_vh_ipi_stop_rcuidle(regs)
-#endif
 
 #endif /* _TRACE_HOOK_DEBUG_H */
 /* This part must be outside protection */
diff --git a/include/trace/hooks/gpiolib.h b/include/trace/hooks/gpiolib.h
index 24cb3f54fb82..307fbaa2cae0 100644
--- a/include/trace/hooks/gpiolib.h
+++ b/include/trace/hooks/gpiolib.h
@@ -10,13 +10,9 @@
 #include <trace/hooks/vendor_hooks.h>
 #include "../drivers/gpio/gpiolib.h"
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 DECLARE_HOOK(android_vh_gpio_block_read,
 	TP_PROTO(struct gpio_device *gdev, bool *block_gpio_read),
 	TP_ARGS(gdev, block_gpio_read));
-#else
-#define trace_android_vh_gpio_block_read(gdev, block_gpio_read)
-#endif
 
 #endif /* _TRACE_HOOK_GPIOLIB_H */
 /* This part must be outside protection */
diff --git a/include/trace/hooks/iommu.h b/include/trace/hooks/iommu.h
index 6c30cb7932fa..c09f1a4bf65a 100644
--- a/include/trace/hooks/iommu.h
+++ b/include/trace/hooks/iommu.h
@@ -11,7 +11,6 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 DECLARE_RESTRICTED_HOOK(android_rvh_iommu_setup_dma_ops,
 	TP_PROTO(struct device *dev, u64 dma_base, u64 size),
 	TP_ARGS(dev, dma_base, size), 1);
@@ -23,13 +22,6 @@ DECLARE_HOOK(android_vh_iommu_alloc_iova,
 DECLARE_HOOK(android_vh_iommu_free_iova,
 	TP_PROTO(dma_addr_t iova, size_t size),
 	TP_ARGS(iova, size));
-#else
-
-#define trace_android_rvh_iommu_setup_dma_ops(dev, dma_base, size)
-#define trace_android_vh_iommu_alloc_iova(dev, iova, size)
-#define trace_android_vh_iommu_free_iova(iova, size)
-
-#endif
 
 #endif /* _TRACE_HOOK_IOMMU_H */
 
diff --git a/include/trace/hooks/psi.h b/include/trace/hooks/psi.h
index ffda9543357e..32c7a273c5e2 100644
--- a/include/trace/hooks/psi.h
+++ b/include/trace/hooks/psi.h
@@ -9,8 +9,6 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
-
 #ifdef __GENKSYMS__
 struct psi_group;
 struct psi_trigger;
@@ -26,11 +24,6 @@ DECLARE_HOOK(android_vh_psi_group,
 	TP_PROTO(struct psi_group *group),
 	TP_ARGS(group));
 
-#else
-#define trace_android_vh_psi_event(t)
-#define trace_android_vh_psi_group(group)
-#endif
-
 #endif /* _TRACE_HOOK_PSI_H */
 
 /* This part must be outside protection */