qcacld-3.0: Remove OEM DATA request callback support

qcacld-2.0 to qcacld-3.0 propagation.

The SME OEM DATA request API supports a callback function pointer,
however this callback functionality is obsolete.  Therefore remove
this functionality.

Change-Id: Id06910841ad625412ba1f3222407e471f4d7edd7
CRs-Fixed: 911404

core/hdd/src/wlan_hdd_oemdata.c

@@ -47,52 +47,6 @@
 
 static struct hdd_context_s *p_hdd_ctx;
 
-/**
- * hdd_oem_data_req_callback() - OEM Data request callback handler
- * @hHal: MAC handle
- * @pContext: User context.  For this callback the net device was registered
- * @oemDataReqID: The ID of the request
- * @oemDataReqStatus: Status of the request
- *
- * This function reports the results of the request to user space
- *
- * Return: CDF_STATUS enumeration
- */
-static CDF_STATUS hdd_oem_data_req_callback(tHalHandle hHal,
-					    void *pContext,
-					    uint32_t oemDataReqID,
-					    eOemDataReqStatus oemDataReqStatus)
-{
-	CDF_STATUS status = CDF_STATUS_SUCCESS;
-	struct net_device *dev = (struct net_device *)pContext;
-	union iwreq_data wrqu;
-	char buffer[IW_CUSTOM_MAX + 1];
-
-	memset(&wrqu, '\0', sizeof(wrqu));
-	memset(buffer, '\0', sizeof(buffer));
-
-	if (oemDataReqStatus == eOEM_DATA_REQ_FAILURE) {
-		snprintf(buffer, IW_CUSTOM_MAX, "QCOM: OEM-DATA-REQ-FAILED");
-		hddLog(LOGW, "%s: oem data req %d failed", __func__,
-		       oemDataReqID);
-	} else if (oemDataReqStatus == eOEM_DATA_REQ_INVALID_MODE) {
-		snprintf(buffer, IW_CUSTOM_MAX,
-			 "QCOM: OEM-DATA-REQ-INVALID-MODE");
-		hddLog(LOGW,
-		       "%s: oem data req %d failed because the driver is in invalid mode (IBSS|AP)",
-		       __func__, oemDataReqID);
-	} else {
-		snprintf(buffer, IW_CUSTOM_MAX, "QCOM: OEM-DATA-REQ-SUCCESS");
-	}
-
-	wrqu.data.pointer = buffer;
-	wrqu.data.length = strlen(buffer);
-
-	wireless_send_event(dev, IWEVCUSTOM, &wrqu, buffer);
-
-	return status;
-}
-
 /**
  * iw_get_oem_data_cap() - Get OEM Data Capabilities
  * @dev: net device upon which the request was received
@@ -428,8 +382,7 @@ static CDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData)
 	status = sme_oem_data_req(p_hdd_ctx->hHal,
 				  pAdapter->sessionId,
 				  &oemDataReqConfig,
-				  &oemDataReqID,
-				  &hdd_oem_data_req_callback, pAdapter->dev);
+				  &oemDataReqID);
 	return status;
 }
 

core/sme/inc/oem_data_api.h

@@ -76,9 +76,7 @@ typedef CDF_STATUS (*oem_data_oem_data_reqCompleteCallback)(tHalHandle,
 		void *p2, uint32_t oemDataReqID, eOemDataReqStatus status);
 
 CDF_STATUS oem_data_oem_data_req(tHalHandle, uint8_t, tOemDataReqConfig *,
-		uint32_t *pOemDataReqID,
-		oem_data_oem_data_reqCompleteCallback callback,
-		void *pContext);
+				 uint32_t *pOemDataReqID);
 CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *);
 CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal);
 typedef void (*sme_send_oem_data_rsp_msg)(int length, uint8_t *oem_data_rsp);

core/sme/inc/oem_data_internal.h

@@ -59,8 +59,6 @@ typedef struct tagOemDataStruct {
 
 typedef struct tagOemDataCmd {
 	uint32_t oemDataReqID;
-	oem_data_oem_data_reqCompleteCallback callback;
-	void *pContext;
 	tOemDataReq oemDataReq;
 } tOemDataCmd;
 #endif /* __OEM_DATA_INTERNAL_H__ */

core/sme/inc/sme_api.h

@@ -475,9 +475,7 @@ CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId,
 CDF_STATUS sme_oem_data_req(tHalHandle hHal,
 		uint8_t sessionId,
 		tOemDataReqConfig *,
-		uint32_t *pOemDataReqID,
-		oem_data_oem_data_reqCompleteCallback callback,
-		void *pContext);
+		uint32_t *pOemDataReqID);
 #endif /*FEATURE_OEM_DATA_SUPPORT */
 CDF_STATUS sme_roam_update_apwpsie(tHalHandle, uint8_t sessionId,
 		tSirAPWPSIEs * pAPWPSIES);

core/sme/src/common/sme_api.c

@@ -5600,16 +5600,12 @@ CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId,
     \brief a wrapper function for OEM DATA REQ
     \param sessionId - session id to be used.
     \param pOemDataReqId - pointer to an object to get back the request ID
-    \param callback - a callback function that is called upon finish
-    \param pContext - a pointer passed in for the callback
     \return CDF_STATUS
    ---------------------------------------------------------------------------*/
 CDF_STATUS sme_oem_data_req(tHalHandle hHal,
 			    uint8_t sessionId,
 			    tOemDataReqConfig *pOemDataReqConfig,
-			    uint32_t *pOemDataReqID,
-			    oem_data_oem_data_reqCompleteCallback callback,
-			    void *pContext)
+			    uint32_t *pOemDataReqID)
 {
 	CDF_STATUS status = CDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -5629,8 +5625,8 @@ CDF_STATUS sme_oem_data_req(tHalHandle hHal,
 
 			status =
 				oem_data_oem_data_req(hHal, sessionId,
-						      pOemDataReqConfig, pOemDataReqID,
-						      callback, pContext);
+						      pOemDataReqConfig,
+						      pOemDataReqID);
 
 			/* release the lock for the sme object */
 			sme_release_global_lock(&pMac->sme);

core/sme/src/oem_data/oem_data_api.c

@@ -124,16 +124,12 @@ void oem_data_release_oem_data_req_command(tpAniSirGlobal pMac,
     \brief Request an OEM DATA RSP
     \param sessionId - Id of session to be used
     \param pOemDataReqID - pointer to an object to get back the request ID
-    \param callback - a callback function that is called upon finish
-    \param pContext - a pointer passed in for the callback
     \return CDF_STATUS
    -------------------------------------------------------------------------------*/
 CDF_STATUS oem_data_oem_data_req(tHalHandle hHal,
 				 uint8_t sessionId,
 				 tOemDataReqConfig *oemDataReqConfig,
-				 uint32_t *pOemDataReqID,
-				 oem_data_oem_data_reqCompleteCallback callback,
-				 void *pContext)
+				 uint32_t *pOemDataReqID)
 {
 	CDF_STATUS status = CDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -146,8 +142,6 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal,
 		}
 
 		pMac->oemData.oemDataReqConfig.sessionId = sessionId;
-		pMac->oemData.callback = callback;
-		pMac->oemData.pContext = pContext;
 		pMac->oemData.oemDataReqID = *(pOemDataReqID);
 
 		cdf_mem_copy((void *)(pMac->oemData.oemDataReqConfig.
@@ -162,8 +156,6 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal,
 		/* fill up the command before posting it. */
 		if (pOemDataCmd) {
 			pOemDataCmd->command = eSmeCommandOemDataReq;
-			pOemDataCmd->u.oemDataCmd.callback = callback;
-			pOemDataCmd->u.oemDataCmd.pContext = pContext;
 			pOemDataCmd->u.oemDataCmd.oemDataReqID =
 				pMac->oemData.oemDataReqID;