From ffa38768fa4e8d1e9bbbc5ffddd97e491520ee0d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Mon, 25 Sep 2017 18:14:47 -0700
Subject: [PATCH] qcacld-3.0: Refine API wlansap_scan_callback()

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

Change-Id: I7c77827de37a4beb4bedcfb5716e61573c27eaad
CRs-Fixed: 2116267
---
 core/sap/src/sap_api_link_cntl.c | 17 +++--------------
 core/sap/src/sap_internal.h      | 21 ++++++++++++++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index c6a2e66be071..e68806b7f550 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -88,24 +88,13 @@
  * Function Declarations and Documentation
  * -------------------------------------------------------------------------*/
 
-/*
- * wlansap_scan_callback() - Callback for Scan (scan results) Events
- *
- * @hal_handle  : tHalHandle passed in with the scan request
- * @ctx   : The second context pass in for the caller (sapContext)
- * @scanID      : scanID got after the scan
- *
- *  Callback for Scan (scan results) Events
- *
- * Return: Status
- */
 QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
-				 void *ctx,   /* Opaque SAP handle */
+				 struct sap_context *sap_ctx,
 				 uint8_t session_id,
-				 uint32_t scan_id, eCsrScanStatus scan_status) {
+				 uint32_t scan_id, eCsrScanStatus scan_status)
+{
 	tScanResultHandle result = NULL;
 	QDF_STATUS get_result_status = QDF_STATUS_E_FAILURE;
-	struct sap_context *sap_ctx = ctx;
 	tWLAN_SAPEvent sapEvent;        /* State machine event */
 	uint8_t operChannel = 0;
 	QDF_STATUS sap_sm_status;
diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h
index 7abb81ea1e80..d0a14bd720c3 100644
--- a/core/sap/src/sap_internal.h
+++ b/core/sap/src/sap_internal.h
@@ -286,11 +286,22 @@ typedef struct sWLAN_SAPEvent {
 QDF_STATUS wlansap_context_get(struct sap_context *ctx);
 void wlansap_context_put(struct sap_context *ctx);
 
-QDF_STATUS
-wlansap_scan_callback
-	(tHalHandle halHandle,
-	void *pContext,
-	uint8_t sessionId, uint32_t scanID, eCsrScanStatus scanStatus);
+/**
+ * wlansap_scan_callback() - Callback for Scan (scan results) Events
+ * @hal_handle: tHalHandle passed in with the scan request
+ * @sap_ctx: The sap context
+ * @session_id: ID of the current session
+ * @scan_id: ID assigned to the scan
+ * @scan_status: Status of the scan
+ *
+ * Callback for Scan (scan results) Events
+ *
+ * Return: Status
+ */
+QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
+				 struct sap_context *sap_ctx,
+				 uint8_t session_id,
+				 uint32_t scan_id, eCsrScanStatus scan_status);
 
 QDF_STATUS
 wlansap_pre_start_bss_acs_scan_callback(