From 80150e97159aa0b1bb27025ad2d3219054a3d5a5 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Mon, 18 Mar 2019 14:14:17 -0700 Subject: [PATCH] qcacmn: Remove qdf_ssr_protect/unprotect Remove the unused qdf_ssr_protect/unprotect and related APIs. Change-Id: I55ce40646584c32816ad38caec4c5cdee896b7fa CRs-Fixed: 2418459 --- qdf/inc/qdf_platform.h | 51 ------------------------------------------ qdf/src/qdf_platform.c | 51 +++--------------------------------------- 2 files changed, 3 insertions(+), 99 deletions(-) diff --git a/qdf/inc/qdf_platform.h b/qdf/inc/qdf_platform.h index 31a707ca8e..60ced24f1b 100644 --- a/qdf/inc/qdf_platform.h +++ b/qdf/inc/qdf_platform.h @@ -36,20 +36,6 @@ typedef void (*qdf_self_recovery_callback)(enum qdf_hang_reason reason, const char *func, const uint32_t line); -/** - * qdf_ssr_callback() - callback for ssr - * - * Return: true if fw is down and false if fw is not down - */ -typedef void (*qdf_ssr_callback)(const char *); - -/** - * qdf_is_module_state_transitioning_cb() - callback to check module state - * - * Return: true if module is in transition, else false - */ -typedef int (*qdf_is_module_state_transitioning_cb)(void); - /** * qdf_is_fw_down_callback() - callback to query if fw is down * @@ -94,43 +80,6 @@ void qdf_register_self_recovery_callback(qdf_self_recovery_callback callback); __qdf_trigger_self_recovery(__func__, __LINE__) void __qdf_trigger_self_recovery(const char *func, const uint32_t line); -/** - * qdf_register_ssr_protect_callbacks() - register [un]protect callbacks - * - * Return: None - */ -void qdf_register_ssr_protect_callbacks(qdf_ssr_callback protect, - qdf_ssr_callback unprotect); - -/** - * qdf_ssr_protect() - start SSR protection - * - * Return: None - */ -void qdf_ssr_protect(const char *caller); - -/** - * qdf_ssr_unprotect() - remove SSR protection - * - * Return: None - */ -void qdf_ssr_unprotect(const char *caller); - -/** - * qdf_register_module_state_query_callback() - register module state query - * - * Return: None - */ -void qdf_register_module_state_query_callback( - qdf_is_module_state_transitioning_cb query); - -/** - * qdf_is_module_state_transitioning() - query module state transition - * - * Return: true if in transition else false - */ -bool qdf_is_module_state_transitioning(void); - /** * qdf_is_recovering_callback() - callback to get driver recovering in progress * or not diff --git a/qdf/src/qdf_platform.c b/qdf/src/qdf_platform.c index 83621589bb..2e16109896 100644 --- a/qdf/src/qdf_platform.c +++ b/qdf/src/qdf_platform.c @@ -24,12 +24,9 @@ * The following callbacks should be defined static to make sure they are * initialized to NULL */ -static qdf_self_recovery_callback self_recovery_cb; -static qdf_ssr_callback ssr_protect_cb; -static qdf_ssr_callback ssr_unprotect_cb; -static qdf_is_module_state_transitioning_cb module_state_transitioning_cb; -static qdf_is_fw_down_callback is_fw_down_cb; -static qdf_is_recovering_callback is_recovering_cb; +static qdf_self_recovery_callback self_recovery_cb; +static qdf_is_fw_down_callback is_fw_down_cb; +static qdf_is_recovering_callback is_recovering_cb; void qdf_register_fw_down_callback(qdf_is_fw_down_callback is_fw_down) { @@ -68,48 +65,6 @@ void __qdf_trigger_self_recovery(const char *func, const uint32_t line) qdf_export_symbol(__qdf_trigger_self_recovery); -void qdf_register_ssr_protect_callbacks(qdf_ssr_callback protect, - qdf_ssr_callback unprotect) -{ - ssr_protect_cb = protect; - ssr_unprotect_cb = unprotect; -} - -qdf_export_symbol(qdf_register_ssr_protect_callbacks); - -void qdf_ssr_protect(const char *caller) -{ - if (ssr_protect_cb) - ssr_protect_cb(caller); -} - -qdf_export_symbol(qdf_ssr_protect); - -void qdf_ssr_unprotect(const char *caller) -{ - if (ssr_unprotect_cb) - ssr_unprotect_cb(caller); -} - -qdf_export_symbol(qdf_ssr_unprotect); - -void qdf_register_module_state_query_callback( - qdf_is_module_state_transitioning_cb query) -{ - module_state_transitioning_cb = query; -} - -qdf_export_symbol(qdf_register_module_state_query_callback); - -bool qdf_is_module_state_transitioning(void) -{ - if (module_state_transitioning_cb) - return module_state_transitioning_cb(); - return false; -} - -qdf_export_symbol(qdf_is_module_state_transitioning); - void qdf_register_recovering_state_query_callback( qdf_is_recovering_callback is_recovering) {