qcacld-2.0: Remove OEM DATA request callback support

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

6 files changed, 6 insertions, 74 deletions

diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c
index ad8146778e0c..104e54efe692 100644
--- a/CORE/HDD/src/wlan_hdd_oemdata.c
+++ b/CORE/HDD/src/wlan_hdd_oemdata.c
@@ -50,49 +50,6 @@
 static struct hdd_context_s *pHddCtx;
 
 
-/*---------------------------------------------------------------------------
-
-  \brief hdd_OemDataReqCallback() -
-
-  This function also reports the results to the user space
-
-  \return - eHalStatus enumeration
-
-----------------------------------------------------------------------------*/
-static eHalStatus hdd_OemDataReqCallback(tHalHandle hHal,
-        void *pContext,
-        tANI_U32 oemDataReqID,
-        eOemDataReqStatus oemDataReqStatus)
-{
-    eHalStatus status = eHAL_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));
-
-    //now if the status is success, then send an event up
-    //so that the application can request for the data
-    //else no need to send the event up
-    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;
-}
-
 /**---------------------------------------------------------------------------
 
   \brief iw_get_oem_data_cap()
@@ -459,9 +416,7 @@ static eHalStatus oem_process_data_req_msg(int oemDataLen, char *oemData)
    status = sme_OemDataReq(pHddCtx->hHal,
                            pAdapter->sessionId,
                            &oemDataReqConfig,
-                           &oemDataReqID,
-                           &hdd_OemDataReqCallback,
-                           pAdapter->dev);
+                           &oemDataReqID);
    return status;
 }
 
diff --git a/CORE/SME/inc/oemDataApi.h b/CORE/SME/inc/oemDataApi.h
index 2945848dc173..80c7af56f884 100644
--- a/CORE/SME/inc/oemDataApi.h
+++ b/CORE/SME/inc/oemDataApi.h
@@ -109,12 +109,9 @@ typedef eHalStatus (*oemData_OemDataReqCompleteCallback)(
     \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 eHalStatus
   -------------------------------------------------------------------------------*/
-eHalStatus oemData_OemDataReq(tHalHandle, tANI_U8, tOemDataReqConfig *, tANI_U32 *pOemDataReqID,
-                            oemData_OemDataReqCompleteCallback callback, void *pContext);
+eHalStatus oemData_OemDataReq(tHalHandle, tANI_U8, tOemDataReqConfig *, tANI_U32 *pOemDataReqID);
 
 /* ---------------------------------------------------------------------------
     \fn sme_HandleOemDataRsp
diff --git a/CORE/SME/inc/oemDataInternal.h b/CORE/SME/inc/oemDataInternal.h
index 0496eaf2903f..ba5612edc183 100644
--- a/CORE/SME/inc/oemDataInternal.h
+++ b/CORE/SME/inc/oemDataInternal.h
@@ -51,8 +51,6 @@ typedef struct tagOemDataStruct
     tANI_U32                         nextOemReqId; //a global req id
     tANI_BOOLEAN                     oemDataReqActive; //indicates that currently a request has been posted and
                                                         //waiting for the response
-    oemData_OemDataReqCompleteCallback   callback; //callback function pointer for returning the response
-    void*                            pContext; //context of the original caller
     tANI_U32                         oemDataReqID; //original request ID
     tOemDataReqConfig                oemDataReqConfig; //current oem data request
     tANI_U8                          sessionId; //Session on which oem data req is active
@@ -61,8 +59,6 @@ typedef struct tagOemDataStruct
 typedef struct tagOemDataCmd
 {
     tANI_U32                            oemDataReqID;
-    oemData_OemDataReqCompleteCallback      callback;
-    void*                               pContext;
     tOemDataReq                         oemDataReq;
 } tOemDataCmd;
 
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index c8794a3b8761..d822b4c9ce90 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -1921,16 +1921,12 @@ eHalStatus sme_ScanGetBKIDCandidateList(tHalHandle hHal, tANI_U32 sessionId,
     \fn sme_OemDataReq
     \param sessionId - session id of session to be used for oem data req.
     \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 eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_OemDataReq(tHalHandle hHal,
                                        tANI_U8 sessionId,
                                        tOemDataReqConfig *,
-                                       tANI_U32 *pOemDataReqID,
-                                       oemData_OemDataReqCompleteCallback callback,
-                                       void *pContext);
+                                       tANI_U32 *pOemDataReqID);
 
 #endif /*FEATURE_OEM_DATA_SUPPORT*/
 
diff --git a/CORE/SME/src/oemData/oemDataApi.c b/CORE/SME/src/oemData/oemDataApi.c
index 5318c18df077..d0d6df07cc79 100644
--- a/CORE/SME/src/oemData/oemDataApi.c
+++ b/CORE/SME/src/oemData/oemDataApi.c
@@ -125,16 +125,12 @@ void oemData_ReleaseOemDataReqCommand(tpAniSirGlobal pMac, tSmeCmd *pOemDataCmd,
     \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 eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus oemData_OemDataReq(tHalHandle hHal,
                                 tANI_U8 sessionId,
                                 tOemDataReqConfig *oemDataReqConfig,
-                                tANI_U32 *pOemDataReqID,
-                                oemData_OemDataReqCompleteCallback callback,
-                                void *pContext)
+                                tANI_U32 *pOemDataReqID)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -149,8 +145,6 @@ eHalStatus oemData_OemDataReq(tHalHandle hHal,
         }
 
         pMac->oemData.oemDataReqConfig.sessionId = sessionId;
-        pMac->oemData.callback = callback;
-        pMac->oemData.pContext = pContext;
         pMac->oemData.oemDataReqID = *(pOemDataReqID);
 
         vos_mem_copy((v_VOID_t*)(pMac->oemData.oemDataReqConfig.oemDataReq),
@@ -165,8 +159,6 @@ eHalStatus oemData_OemDataReq(tHalHandle hHal,
         if(pOemDataCmd)
         {
             pOemDataCmd->command = eSmeCommandOemDataReq;
-            pOemDataCmd->u.oemDataCmd.callback = callback;
-            pOemDataCmd->u.oemDataCmd.pContext = pContext;
             pOemDataCmd->u.oemDataCmd.oemDataReqID = pMac->oemData.oemDataReqID;
 
             //set the oem data request
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 56fab7c7109a..342eb1f929b5 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -6916,16 +6916,12 @@ eHalStatus sme_ScanGetBKIDCandidateList(tHalHandle hHal, tANI_U32 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 eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_OemDataReq(tHalHandle hHal,
         tANI_U8 sessionId,
         tOemDataReqConfig *pOemDataReqConfig,
-        tANI_U32 *pOemDataReqID,
-        oemData_OemDataReqCompleteCallback callback,
-        void *pContext)
+        tANI_U32 *pOemDataReqID)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -6948,7 +6944,7 @@ eHalStatus sme_OemDataReq(tHalHandle hHal,
                 return eHAL_STATUS_FAILURE;
             }
 
-            status = oemData_OemDataReq(hHal, sessionId, pOemDataReqConfig, pOemDataReqID, callback, pContext);
+            status = oemData_OemDataReq(hHal, sessionId, pOemDataReqConfig, pOemDataReqID);
 
             //release the lock for the sme object
             sme_ReleaseGlobalLock( &pMac->sme );