diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 8ba5e8c9642b..64079e850f2e 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -213,5 +213,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_mem); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_print_slabinfo_header); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cache_show); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_typec_tcpci_override_toggling); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_typec_tcpci_check_contaminant); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_typec_tcpci_get_vbus); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_typec_tcpci_chk_contaminant); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_typec_tcpci_get_vbus); diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index 372a5fb0baf4..f337a6cf115e 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -419,7 +419,7 @@ static int tcpci_get_vbus(struct tcpc_dev *tcpc) unsigned int reg; int ret, vbus, bypass = 0; - trace_android_vh_typec_tcpci_get_vbus(tcpci, tcpci->data, &vbus, &bypass); + trace_android_rvh_typec_tcpci_get_vbus(tcpci, tcpci->data, &vbus, &bypass); if (bypass) return vbus; @@ -435,7 +435,7 @@ static int tcpci_check_contaminant(struct tcpc_dev *tcpc) struct tcpci *tcpci = tcpc_to_tcpci(tcpc); int ret = 0; - trace_android_vh_typec_tcpci_check_contaminant(tcpci, tcpci->data, &ret); + trace_android_rvh_typec_tcpci_chk_contaminant(tcpci, tcpci->data, &ret); return ret; } diff --git a/include/trace/hooks/typec.h b/include/trace/hooks/typec.h index 127a16b440c1..8252dab49b98 100644 --- a/include/trace/hooks/typec.h +++ b/include/trace/hooks/typec.h @@ -17,9 +17,9 @@ DECLARE_HOOK(android_vh_typec_tcpci_override_toggling, TP_PROTO(struct tcpci *tcpci, struct tcpci_data *data, int *override_toggling), TP_ARGS(tcpci, data, override_toggling)); -DECLARE_HOOK(android_vh_typec_tcpci_check_contaminant, +DECLARE_RESTRICTED_HOOK(android_rvh_typec_tcpci_chk_contaminant, TP_PROTO(struct tcpci *tcpci, struct tcpci_data *data, int *ret), - TP_ARGS(tcpci, data, ret)); + TP_ARGS(tcpci, data, ret), 1); /* * This hook is for addressing hardware anomalies where TCPC_POWER_STATUS_VBUS_PRES bit can return 0 @@ -28,9 +28,9 @@ DECLARE_HOOK(android_vh_typec_tcpci_check_contaminant, * function. * Handler can set vbus or clear vbus to indicate vbus present or absent */ -DECLARE_HOOK(android_vh_typec_tcpci_get_vbus, +DECLARE_RESTRICTED_HOOK(android_rvh_typec_tcpci_get_vbus, TP_PROTO(struct tcpci *tcpci, struct tcpci_data *data, int *vbus, int *bypass), - TP_ARGS(tcpci, data, vbus, bypass)); + TP_ARGS(tcpci, data, vbus, bypass), 1); #endif /* _TRACE_HOOK_UFSHCD_H */ /* This part must be outside protection */