From 71277f5c325601f7cebf8dbb6e97e6a5931b2f7b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Tue, 26 Mar 2019 12:37:11 -0700
Subject: [PATCH] qcacld-3.0: Harmonize wlansap_roam_callback()

Most of the identifiers used in the wlansap_roam_callback() prototype do
not match the ones used in the implementation, and furthermore the one
that does match does not conform to the coding standard, so update both
the prototype and the implementation to have identical, conforming
identifiers.

Change-Id: I3cf3622121d15bb6c9fb2f9a63a0f9b99dd675f6
CRs-Fixed: 2423731
---
 core/sap/inc/sap_api.h           | 20 ++++++++++----------
 core/sap/src/sap_api_link_cntl.c |  9 +++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h
index c26efa5896b3..c267df49d495 100644
--- a/core/sap/inc/sap_api.h
+++ b/core/sap/inc/sap_api.h
@@ -662,11 +662,11 @@ struct sap_context;
 
 /**
  * wlansap_roam_callback() - API to get the events for SAP persona
- * @pContext: sap context
- * @pCsrRoamInfo: pointer to SME CSR roam info structure
- * @roamId: roam id being used
- * @roamStatus: status of the event reported by SME to SAP
- * @roamResult: result of the event reported by SME to SAP
+ * @ctx: callback context registered with SME (sap context is registered)
+ * @csr_roam_info: pointer to SME CSR roam info structure
+ * @roam_id: roam id being used
+ * @roam_status: status of the event reported by SME to SAP
+ * @roam_result: result of the event reported by SME to SAP
  *
  * Any activity like start_bss, stop_bss, and etc for SAP persona
  * happens, SME reports the result of those events to SAP through this
@@ -674,11 +674,11 @@ struct sap_context;
  *
  * Return: QDF_STATUS based on overall result
  */
-QDF_STATUS wlansap_roam_callback(void *pContext,
-				 struct csr_roam_info *pCsrRoamInfo,
-				 uint32_t roamId,
-				 eRoamCmdStatus roamStatus,
-				 eCsrRoamResult roamResult);
+QDF_STATUS wlansap_roam_callback(void *ctx,
+				 struct csr_roam_info *csr_roam_info,
+				 uint32_t roam_id,
+				 eRoamCmdStatus roam_status,
+				 eCsrRoamResult roam_result);
 
 /**
  * sap_create_ctx() - API to create the sap context
diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index 746f90ae4b6e..a0a4b161f49d 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -761,10 +761,11 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx,
 	}
 }
 
-QDF_STATUS
-wlansap_roam_callback(void *ctx, struct csr_roam_info *csr_roam_info,
-		      uint32_t roamId,
-		      eRoamCmdStatus roam_status, eCsrRoamResult roam_result)
+QDF_STATUS wlansap_roam_callback(void *ctx,
+				 struct csr_roam_info *csr_roam_info,
+				 uint32_t roam_id,
+				 eRoamCmdStatus roam_status,
+				 eCsrRoamResult roam_result)
 {
 	/* sap_ctx value */
 	struct sap_context *sap_ctx = ctx;