qcacld-3.0: Remove usage of typedef for oem related structures

Remove the usage of typedef for oem data request and oem
data response data structure.

Change-Id: I94f05833baa9b6baaf2272f63a33236437a96bbf
CRs-Fixed: 1038872

8 files changed, 15 insertions, 17 deletions

diff --git a/core/hdd/inc/wlan_hdd_oemdata.h b/core/hdd/inc/wlan_hdd_oemdata.h
index 33dd4527d5e6..ed1ab4d9ca9d 100644
--- a/core/hdd/inc/wlan_hdd_oemdata.h
+++ b/core/hdd/inc/wlan_hdd_oemdata.h
@@ -186,7 +186,7 @@ int iw_get_oem_data_cap(struct net_device *dev, struct iw_request_info *info,
 
 int oem_activate_service(struct hdd_context_s *hdd_ctx);
 
-void hdd_send_oem_data_rsp_msg(tSirOemDataRsp *oem_rsp);
+void hdd_send_oem_data_rsp_msg(struct oem_data_rsp *oem_rsp);
 #else
 static inline int oem_activate_service(struct hdd_context_s *hdd_ctx)
 {
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index 5e46a72b3f66..ffa0934207f0 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -302,7 +302,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code)
  *
  * Return: 0 for success, non zero for failure
  */
-void hdd_send_oem_data_rsp_msg(tSirOemDataRsp *oem_data_rsp)
+void hdd_send_oem_data_rsp_msg(struct oem_data_rsp *oem_data_rsp)
 {
 	struct sk_buff *skb;
 	struct nlmsghdr *nlh;
@@ -364,7 +364,7 @@ void hdd_send_oem_data_rsp_msg(tSirOemDataRsp *oem_data_rsp)
 static QDF_STATUS oem_process_data_req_msg(int oem_data_len, char *oem_data)
 {
 	hdd_adapter_t *adapter = NULL;
-	tSirOemDataReq oem_data_req;
+	struct oem_data_req oem_data_req;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	/* for now, STA interface only */
@@ -379,7 +379,7 @@ static QDF_STATUS oem_process_data_req_msg(int oem_data_len, char *oem_data)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	qdf_mem_zero(&oem_data_req, sizeof(tSirOemDataReq));
+	qdf_mem_zero(&oem_data_req, sizeof(oem_data_req));
 
 	oem_data_req.data = qdf_mem_malloc(oem_data_len);
 	if (!oem_data_req.data) {
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index d5ae056eb38f..3e882ca20a5d 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -882,17 +882,15 @@ typedef struct sSirSmeScanChanReq {
 } tSirSmeGetScanChanReq, *tpSirSmeGetScanChanReq;
 
 #ifdef FEATURE_OEM_DATA_SUPPORT
-
-typedef struct sSirOemDataReq {
+struct oem_data_req {
 	uint32_t data_len;
 	uint8_t *data;
-} tSirOemDataReq, *tpSirOemDataReq;
+};
 
-typedef struct sSirOemDataRsp {
+struct oem_data_rsp {
 	uint32_t rsp_len;
 	uint8_t *data;
-} tSirOemDataRsp, *tpSirOemDataRsp;
-
+};
 #endif /* FEATURE_OEM_DATA_SUPPORT */
 
 #ifdef FEATURE_WLAN_ESE
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index 043c3963b9e5..366f52a1e754 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -455,7 +455,7 @@ QDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId,
 		uint32_t *pNumItems);
 #endif /* FEATURE_WLAN_WAPI */
 #ifdef FEATURE_OEM_DATA_SUPPORT
-QDF_STATUS sme_oem_data_req(tHalHandle hHal, tSirOemDataReq *);
+QDF_STATUS sme_oem_data_req(tHalHandle hHal, struct oem_data_req *);
 QDF_STATUS sme_oem_update_capability(tHalHandle hHal,
 				     struct sme_oem_capability *cap);
 QDF_STATUS sme_oem_get_capability(tHalHandle hHal,
diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h
index 44bb9a7bd5a1..51c135ec235c 100644
--- a/core/sme/inc/sme_internal.h
+++ b/core/sme/inc/sme_internal.h
@@ -153,7 +153,7 @@ typedef void (*preferred_network_found_ind_cb)(void *callback_context,
 typedef void (*ocb_callback)(void *context, void *response);
 typedef void (*sme_set_thermal_level_callback)(void *context, u_int8_t level);
 typedef void (*p2p_lo_callback)(void *context, void *event);
-typedef void (*sme_send_oem_data_rsp_msg)(tSirOemDataRsp *);
+typedef void (*sme_send_oem_data_rsp_msg)(struct oem_data_rsp *);
 
 typedef struct tagSmeStruct {
 	eSmeState state;
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 3435930f3dbf..47c3a85c4104 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -5900,11 +5900,11 @@ QDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId,
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS sme_oem_data_req(tHalHandle hal, tSirOemDataReq *hdd_oem_req)
+QDF_STATUS sme_oem_data_req(tHalHandle hal, struct oem_data_req *hdd_oem_req)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
-	tSirOemDataReq *oem_data_req;
+	struct oem_data_req *oem_data_req;
 	void *wma_handle;
 
 	sms_log(mac_ctx, LOG1, FL("enter"));
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 014d903ba2f7..2734541c6cd6 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -2149,5 +2149,5 @@ WLAN_PHY_MODE wma_chan_phy_mode(u8 chan, enum phy_ch_width chan_width,
 
 #ifdef FEATURE_OEM_DATA_SUPPORT
 QDF_STATUS wma_start_oem_data_req(tp_wma_handle wma_handle,
-				  tSirOemDataReq *startOemDataReq);
+				  struct oem_data_req *oem_req);
 #endif
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 84313da6185a..a906e0b610c7 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -1641,7 +1641,7 @@ int wma_oem_data_response_handler(void *handle,
 	WMI_OEM_RESPONSE_EVENTID_param_tlvs *param_buf;
 	uint8_t *data;
 	uint32_t datalen;
-	tSirOemDataRsp *oem_rsp;
+	struct oem_data_rsp *oem_rsp;
 	tpAniSirGlobal pmac = cds_get_context(QDF_MODULE_ID_PE);
 
 	if (!pmac) {
@@ -1715,7 +1715,7 @@ int wma_oem_data_response_handler(void *handle,
  * Return: QDF_STATUS
  */
 QDF_STATUS wma_start_oem_data_req(tp_wma_handle wma_handle,
-			    tSirOemDataReq *oem_data_req)
+			    struct oem_data_req *oem_data_req)
 {
 	int ret = 0;