diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h
index 973c23d4f0af..66382039547b 100644
--- a/core/sap/inc/sap_api.h
+++ b/core/sap/inc/sap_api.h
@@ -860,11 +860,11 @@ void sap_cleanup_channel_list(struct sap_context *pSapCtx);
 
 /**
  * sap_is_auto_channel_select() - is channel AUTO_CHANNEL_SELECT
- * @pvos_gctx: Pointer to vos global context structure
+ * @sapcontext: Pointer to the SAP context
  *
  * Return: true on AUTO_CHANNEL_SELECT, false otherwise
  */
-bool sap_is_auto_channel_select(void *pvos_gctx);
+bool sap_is_auto_channel_select(struct sap_context *sapcontext);
 
 QDF_STATUS wlansap_global_init(void);
 QDF_STATUS wlansap_global_deinit(void);
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index 26065f92f32c..96ff43d89a10 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -2153,14 +2153,12 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53)
 	return status;
 }
 
-bool sap_is_auto_channel_select(void *pvos_gctx)
+bool sap_is_auto_channel_select(struct sap_context *sapcontext)
 {
-	struct sap_context *sapcontext = CDS_GET_SAP_CB(pvos_gctx);
-
 	if (NULL == sapcontext) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid SAP pointer", __func__);
-		return 0;
+		return false;
 	}
 	return sapcontext->channel == AUTO_CHANNEL_SELECT;
 }