From e1282d4fbf38edd76ef4b2390655035e9a689b3e Mon Sep 17 00:00:00 2001
From: Srinivas Girigowda <sgirigow@codeaurora.org>
Date: Thu, 22 Mar 2018 09:37:02 -0700
Subject: [PATCH] qcacld-3.0: Fix clang compilation warnings

Fix clang compilation warnings.

Change-Id: I8c766c9062672608db60c583a46af2bc86bbba8c
CRs-Fixed: 2055487
---
 core/dp/ol/inc/ol_defines.h       | 8 +-------
 core/dp/ol/inc/ol_txrx_ctrl_api.h | 8 +-------
 core/mac/inc/sir_mac_prot_def.h   | 4 ++--
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/core/dp/ol/inc/ol_defines.h b/core/dp/ol/inc/ol_defines.h
index e504dfdcf8a8..2a743a3387cd 100644
--- a/core/dp/ol/inc/ol_defines.h
+++ b/core/dp/ol/inc/ol_defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2016, 2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -66,10 +66,4 @@ typedef struct ol_pdev_t *ol_pdev_handle;
 struct ol_txrx_peer_t;
 typedef struct ol_txrx_peer_t *ol_txrx_peer_handle;
 
-/**
- * @wmi_event_handler function prototype
- */
-typedef int (*wmi_unified_event_handler)(ol_scn_t scn_handle,
-					 uint8_t *event_buf, uint32_t len);
-
 #endif /* _DEV_OL_DEFINES_H */
diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h
index de4fc9e41200..a07fbc477d4c 100644
--- a/core/dp/ol/inc/ol_txrx_ctrl_api.h
+++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -280,12 +280,6 @@ void ol_txrx_pdev_unpause(struct ol_txrx_pdev_t *pdev, uint32_t reason)
  */
 void ol_txrx_tx_sync(ol_txrx_pdev_handle data_pdev, uint8_t sync_cnt);
 
-typedef void (*ol_txrx_vdev_delete_cb)(void *context);
-
-
-typedef void
-(*ol_txrx_data_tx_cb)(void *ctxt, qdf_nbuf_t tx_frm, int had_error);
-
 /**
  * @brief Store a delivery notification callback for specific data frames.
  * @details
diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h
index 1f8582abcde8..4dbc3041e442 100644
--- a/core/mac/inc/sir_mac_prot_def.h
+++ b/core/mac/inc/sir_mac_prot_def.h
@@ -1035,11 +1035,11 @@ typedef struct sSirMacWpaInfo {
 	uint8_t info[SIR_MAC_MAX_IE_LENGTH];
 } qdf_packed tSirMacWpaInfo, *tpSirMacWpaInfo,
 tSirMacRsnInfo, *tpSirMacRsnInfo;
+
 typedef struct sSirMacWapiInfo {
 	uint8_t length;
 	uint8_t info[SIR_MAC_MAX_IE_LENGTH];
-} qdf_packed tSirMacWapiInfo, *tpSirMacWapiInfo,
-tSirMacWapiInfo, *tpSirMacWapiInfo;
+} qdf_packed tSirMacWapiInfo, *tpSirMacWapiInfo;
 
 typedef struct sSirMacFHParamSet {
 	uint16_t dwellTime;