diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 19ceea8fea1a..e75e5e75b192 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -11,7 +11,6 @@
 #include <xen/xen.h>
 #include <xen/swiotlb-xen.h>
 #include <trace/hooks/iommu.h>
-#include <trace/hooks/dma_noalias.h>
 
 #include <asm/cacheflush.h>
 
@@ -57,9 +56,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
 		trace_android_rvh_iommu_setup_dma_ops(dev, dma_base, size);
 	}
 
-	/* Allow vendor modules to opt-in for the 2454944 erratum workaround */
-	trace_android_rvh_setup_dma_ops(dev);
-
 #ifdef CONFIG_XEN
 	if (xen_initial_domain())
 		dev->dma_ops = &xen_swiotlb_dma_ops;
diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index 54c46c11c09a..5702bf54e0e6 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -42,7 +42,6 @@
 #include <trace/hooks/power.h>
 #include <trace/hooks/fault.h>
 #include <trace/hooks/iommu.h>
-#include <trace/hooks/dma_noalias.h>
 #include <trace/hooks/thermal.h>
 #include <trace/hooks/ufshcd.h>
 #include <trace/hooks/block.h>
@@ -217,7 +216,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_die_kernel_fault);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sea);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_mem_abort);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sp_pc_abort);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_setup_dma_ops);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_iommu_setup_dma_ops);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_setup_dma_ops);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_alloc_iova);
diff --git a/include/trace/hooks/dma_noalias.h b/include/trace/hooks/dma_noalias.h
deleted file mode 100644
index 2dc7b04d9ab2..000000000000
--- a/include/trace/hooks/dma_noalias.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM dma_noalias
-
-#define TRACE_INCLUDE_PATH trace/hooks
-
-#if !defined(_TRACE_HOOK_DMA_NOALIAS_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_HOOK_DMA_NOALIAS_H
-
-#include <trace/hooks/vendor_hooks.h>
-
-DECLARE_RESTRICTED_HOOK(android_rvh_setup_dma_ops,
-	TP_PROTO(struct device *dev),
-	TP_ARGS(dev), 1);
-
-#endif /*_TRACE_HOOK_DMA_NOALIAS_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>