qcacld-3.0: Refine API wlansap_cancel_remain_on_channel()

See change "qcacld-3.0: Refine API wlansap_open()" for the API
history.  Update wlansap_cancel_remain_on_channel() to use the
true struct pointer type.

Change-Id: Ibaa79aa4edd9c60915319e2b8f507e70acc0d774
CRs-Fixed: 2116267

core/sap/inc/sap_api.h

@@ -1160,8 +1160,18 @@ QDF_STATUS wlansap_remain_on_channel(struct sap_context *pSapCtx,
 				     remainOnChanCallback callback,
 				     void *pContext, uint32_t *scan_id);
 
-QDF_STATUS wlansap_cancel_remain_on_channel(void *p_cds_gctx,
-		uint32_t scan_id);
+/**
+ * wlansap_cancel_remain_on_channel() - cancel remain on channel
+ * @pSapCtx: Pointer to the SAP context
+ * @scan_id: Scan ID returned by wlansap_remain_on_channel()
+ *
+ * This api cancel previous remain on channel request.
+ *
+ * Return: The QDF_STATUS code associated with performing the operation
+ *         QDF_STATUS_SUCCESS:  Success and error code otherwise
+ */
+QDF_STATUS wlansap_cancel_remain_on_channel(struct sap_context *pSapCtx,
+					    uint32_t scan_id);
 
 /**
  * wlansap_register_mgmt_frame() - register management frame

core/sap/src/sap_module.c

@@ -1558,28 +1558,15 @@ QDF_STATUS wlansap_remain_on_channel(struct sap_context *pSapCtx,
 	return QDF_STATUS_E_FAULT;
 }
 
-/**
- * wlansap_cancel_remain_on_channel() - cancel remain on channel
- * @pCtx: Pointer to the global cds context; a handle to SAP's control block
- *        can be extracted from its context. When MBSSID feature is enabled,
- *        SAP context is directly passed to SAP APIs.
- *
- * This api cancel previous remain on channel request.
- *
- * Return: The QDF_STATUS code associated with performing the operation
- *         QDF_STATUS_SUCCESS:  Success and error code otherwie
- */
-QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx,
-	uint32_t scan_id)
+QDF_STATUS wlansap_cancel_remain_on_channel(struct sap_context *pSapCtx,
+					    uint32_t scan_id)
 {
-	struct sap_context *pSapCtx = NULL;
 	void *hHal = NULL;
 	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
-	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "%s: Invalid SAP pointer from pCtx",
+			  "%s: Invalid SAP pointer",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
 	}