qcacmn: Fix LLVM compiling issues

Remove typedef redefinition, use correct enum type, remove extra
parentheses and correct header guard.

CRs-Fixed: 2214003
Change-Id: I0a75c70cd530590a16f6bfa884955ebc26906de0

7 files changed, 9 insertions, 10 deletions

diff --git a/global_lmac_if/inc/wlan_global_lmac_if_api.h b/global_lmac_if/inc/wlan_global_lmac_if_api.h
index 4f0e6dca8..aadfe7def 100644
--- a/global_lmac_if/inc/wlan_global_lmac_if_api.h
+++ b/global_lmac_if/inc/wlan_global_lmac_if_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -18,7 +18,7 @@
  */
 
 #ifndef _WLAN_GLOBAL_LMAC_IF_API_H_
-#define _WLAN__GLOBAL_LMAC_IF_API_H_
+#define _WLAN_GLOBAL_LMAC_IF_API_H_
 
 #include "wlan_objmgr_cmn.h"
 #include "wlan_objmgr_psoc_obj.h"
diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c
index 8b5fa3545..2e027d67b 100644
--- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c
+++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c
@@ -2176,7 +2176,7 @@ bool policy_mgr_is_sta_active_connection_exists(
 	struct wlan_objmgr_psoc *psoc)
 {
 	return (!policy_mgr_mode_specific_connection_count(
-		psoc, QDF_STA_MODE, NULL)) ? false : true;
+		psoc, PM_STA_MODE, NULL)) ? false : true;
 }
 
 bool policy_mgr_is_any_nondfs_chnl_present(struct wlan_objmgr_psoc *psoc,
diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h
index cbef81312..815bdd5d1 100644
--- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h
+++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h
@@ -26,7 +26,7 @@
  */
 
 #ifndef __WLAN_POLICY_MGR_TABLES_2X2_DBS_H
-#define __WLAN_POLICY_MGR_TABLESY_2X2_DBS_H
+#define __WLAN_POLICY_MGR_TABLES_2X2_DBS_H
 
 #include "wlan_policy_mgr_api.h"
 
diff --git a/umac/dfs/core/src/filtering/dfs_bindetects.c b/umac/dfs/core/src/filtering/dfs_bindetects.c
index 8750858a5..5aaa23c96 100644
--- a/umac/dfs/core/src/filtering/dfs_bindetects.c
+++ b/umac/dfs/core/src/filtering/dfs_bindetects.c
@@ -816,7 +816,7 @@ static void dfs_count_the_other_delay_elements(
 	}
 
 	if (primatch && (deltadur < durmargin)) {
-		if ((*numpulses == 1)) {
+		if (*numpulses == 1) {
 			dl->dl_seq_num_second =
 				dl->dl_elems[delayindex].de_seq_num;
 			dfs_update_min_and_max_sidx(dl, delayindex,
diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c
index 8b7ef2a1b..267e1bc78 100644
--- a/umac/regulatory/core/src/reg_services.c
+++ b/umac/regulatory/core/src/reg_services.c
@@ -891,7 +891,7 @@ enum channel_state reg_get_channel_state(struct wlan_objmgr_pdev *pdev,
 
 	if (!IS_VALID_PDEV_REG_OBJ(pdev_priv_obj)) {
 		reg_err("pdev reg obj is NULL");
-		return QDF_STATUS_E_FAILURE;
+		return CHANNEL_STATE_INVALID;
 	}
 
 	return pdev_priv_obj->cur_chan_list[ch_idx].state;
diff --git a/utils/pktlog/include/pktlog_ac_api.h b/utils/pktlog/include/pktlog_ac_api.h
index f4d4a9024..409773946 100644
--- a/utils/pktlog/include/pktlog_ac_api.h
+++ b/utils/pktlog/include/pktlog_ac_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, 2016-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -39,7 +39,6 @@
  * @brief opaque handle for pktlog device object
  */
 struct ol_pktlog_dev_t;
-typedef struct ol_pktlog_dev_t *ol_pktlog_dev_handle;
 
 /**
  * @typedef hif_opaque_softc_handle
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index 010851797..5014df140 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -1872,7 +1872,7 @@ static QDF_STATUS send_packet_log_disable_cmd_tlv(wmi_unified_t wmi_handle,
 static void send_time_stamp_sync_cmd_tlv(wmi_unified_t wmi_handle)
 {
 	wmi_buf_t buf;
-	A_STATUS status = A_OK;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	WMI_DBGLOG_TIME_STAMP_SYNC_CMD_fixed_param *time_stamp;
 	int32_t len;
 	qdf_time_t time_ms;
@@ -12049,7 +12049,7 @@ static QDF_STATUS send_smart_ant_set_node_config_cmd_tlv(
 	args_tlv_len = WMI_TLV_HDR_SIZE + param->args_count * sizeof(uint32_t);
 	len = sizeof(*cmd) + args_tlv_len;
 
-	if ((param->args_count == 0)) {
+	if (param->args_count == 0) {
 		WMI_LOGE("%s: Can't send a command with %d arguments\n",
 			  __func__, param->args_count);
 		return QDF_STATUS_E_FAILURE;