diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h
index 4476c71aaf0a..d5a1b27e26a3 100644
--- a/core/sap/inc/sap_api.h
+++ b/core/sap/inc/sap_api.h
@@ -1247,7 +1247,18 @@ QDF_STATUS wlansap_de_register_mgmt_frame(struct sap_context *pSapCtx,
 QDF_STATUS wlansap_channel_change_request(void *p_cds_gctx,
 		uint8_t tArgetChannel);
 QDF_STATUS wlansap_start_beacon_req(void *pSapCtx);
-QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx);
+
+/**
+ * wlansap_dfs_send_csa_ie_request() - Send CSA IE
+ * @sap_ctx: Pointer to the SAP context
+ *
+ * This API is used to send channel switch announcement request to PE
+ *
+ * Return: The QDF_STATUS code associated with performing the operation
+ *    QDF_STATUS_SUCCESS:  Success
+ */
+QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx);
+
 QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac);
 QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac);
 QDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal,
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index dc66a3469f0f..e1f9bc44bb25 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -3472,8 +3472,8 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx,
 					  FL("sapdfs: Sending CSAIE for sapctx[%pK]"),
 					  temp_sap_ctx);
 
-				qdf_status = wlansap_dfs_send_csa_ie_request(
-						(void *) temp_sap_ctx);
+				qdf_status =
+					wlansap_dfs_send_csa_ie_request(temp_sap_ctx);
 			}
 		}
 	} else if (eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START == msg) {
@@ -3493,8 +3493,7 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx,
 				persona, sap_ctx->sessionId);
 
 		if ((QDF_SAP_MODE == persona) || (QDF_P2P_GO_MODE == persona))
-			qdf_status = wlansap_dfs_send_csa_ie_request(
-					(void *) sap_ctx);
+			qdf_status = wlansap_dfs_send_csa_ie_request(sap_ctx);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("in state %s, invalid event msg %d"),
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index 5b1d422c7051..f220073ada38 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -1961,34 +1961,13 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx)
 	return QDF_STATUS_E_FAULT;
 }
 
-/*==========================================================================
-   FUNCTION    wlansap_dfs_send_csa_ie_request
-
-   DESCRIPTION
-   This API is used to send channel switch announcement request to PE
-   DEPENDENCIES
-   NA.
-
-   PARAMETERS
-   IN
-   pSapCtx: Pointer to cds global context structure
-
-   RETURN VALUE
-   The QDF_STATUS code associated with performing the operation
-
-   QDF_STATUS_SUCCESS:  Success
-
-   SIDE EFFECTS
-   ============================================================================*/
-QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
+QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx)
 {
-	struct sap_context *sapContext = NULL;
 	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 	tpAniSirGlobal pMac = NULL;
-	sapContext = pSapCtx;
 
-	if (NULL == sapContext) {
+	if (NULL == sap_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer", __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1997,7 +1976,7 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
 	hHal = CDS_GET_HAL_CB();
 	if (NULL == hHal) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "%s: Invalid HAL pointer from p_cds_gctx", __func__);
+			  "%s: Invalid HAL pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	pMac = PMAC_STRUCT(hHal);
@@ -2016,7 +1995,7 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
 			pMac->sap.SapDfsInfo.new_ch_params.sec_ch_offset);
 
 	qdf_ret_status = sme_roam_csa_ie_request(hHal,
-				sapContext->bssid,
+				sap_ctx->bssid,
 				pMac->sap.SapDfsInfo.target_channel,
 				pMac->sap.SapDfsInfo.csaIERequired,
 				&pMac->sap.SapDfsInfo.new_ch_params);