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
This commit is contained in:
Yuanyuan Liu
2018-03-28 18:05:30 -07:00
committed by nshrivas
parent f940918d4f
commit 80bfeb949d
7 changed files with 9 additions and 10 deletions

View File

@@ -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 * Permission to use, copy, modify, and/or distribute this software for
@@ -18,7 +18,7 @@
*/ */
#ifndef _WLAN_GLOBAL_LMAC_IF_API_H_ #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_cmn.h"
#include "wlan_objmgr_psoc_obj.h" #include "wlan_objmgr_psoc_obj.h"

View File

@@ -2176,7 +2176,7 @@ bool policy_mgr_is_sta_active_connection_exists(
struct wlan_objmgr_psoc *psoc) struct wlan_objmgr_psoc *psoc)
{ {
return (!policy_mgr_mode_specific_connection_count( 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, bool policy_mgr_is_any_nondfs_chnl_present(struct wlan_objmgr_psoc *psoc,

View File

@@ -26,7 +26,7 @@
*/ */
#ifndef __WLAN_POLICY_MGR_TABLES_2X2_DBS_H #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" #include "wlan_policy_mgr_api.h"

View File

@@ -816,7 +816,7 @@ static void dfs_count_the_other_delay_elements(
} }
if (primatch && (deltadur < durmargin)) { if (primatch && (deltadur < durmargin)) {
if ((*numpulses == 1)) { if (*numpulses == 1) {
dl->dl_seq_num_second = dl->dl_seq_num_second =
dl->dl_elems[delayindex].de_seq_num; dl->dl_elems[delayindex].de_seq_num;
dfs_update_min_and_max_sidx(dl, delayindex, dfs_update_min_and_max_sidx(dl, delayindex,

View File

@@ -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)) { if (!IS_VALID_PDEV_REG_OBJ(pdev_priv_obj)) {
reg_err("pdev reg obj is NULL"); 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; return pdev_priv_obj->cur_chan_list[ch_idx].state;

View File

@@ -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. * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
* *
@@ -39,7 +39,6 @@
* @brief opaque handle for pktlog device object * @brief opaque handle for pktlog device object
*/ */
struct ol_pktlog_dev_t; struct ol_pktlog_dev_t;
typedef struct ol_pktlog_dev_t *ol_pktlog_dev_handle;
/** /**
* @typedef hif_opaque_softc_handle * @typedef hif_opaque_softc_handle

View File

@@ -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) static void send_time_stamp_sync_cmd_tlv(wmi_unified_t wmi_handle)
{ {
wmi_buf_t buf; 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; WMI_DBGLOG_TIME_STAMP_SYNC_CMD_fixed_param *time_stamp;
int32_t len; int32_t len;
qdf_time_t time_ms; 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); args_tlv_len = WMI_TLV_HDR_SIZE + param->args_count * sizeof(uint32_t);
len = sizeof(*cmd) + args_tlv_len; 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", WMI_LOGE("%s: Can't send a command with %d arguments\n",
__func__, param->args_count); __func__, param->args_count);
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;