From 44f841be2a223d672eaf9fa3029fd9249aeca583 Mon Sep 17 00:00:00 2001 From: MOVZX Date: Tue, 25 Apr 2017 17:04:40 +0300 Subject: [PATCH] prima: Fix GCC6 Warnings Signed-off-by: MOVZX --- drivers/staging/prima/CORE/MAC/src/include/utilsApi.h | 2 +- drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c | 2 +- drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c | 2 +- drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h b/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h index 3a175473378..798a05cd2b4 100644 --- a/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h +++ b/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h @@ -705,7 +705,7 @@ halRoundS32(tANI_S32 p) else k = p; - return(k); + return(k); } // New functions for endianess conversion diff --git a/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c b/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c index 0fc798995ae..6427a04e108 100644 --- a/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c +++ b/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c @@ -60,7 +60,7 @@ // Temporarily (maybe for all of Alpha-1), assuming TIM = 0 // -const tANI_U8 P2pOui[] = {0x50, 0x6F, 0x9A, 0x9}; +tANI_U8 P2pOui[] = {0x50, 0x6F, 0x9A, 0x9}; tSirRetStatus schGetP2pIeOffset(tANI_U8 *pExtraIe, tANI_U32 extraIeLen, tANI_U16 *pP2pIeOffset) #diff --git a/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c b/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c #index 23ab858c355..b4f26def1d1 100644 #--- a/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c #+++ b/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c #@@ -5698,7 +5698,7 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo # if (eHAL_STATUS_SUCCESS != status) # smsLog(pMac, LOGE, # FL( "failed to update the supported channel list")); #- pMac->scan.defer_update_channel_list = false; #+ pMac->scan.defer_update_channel_list = false; # } # # #ifdef WLAN_AP_STA_CONCURRENCY diff --git a/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c b/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c index 14c6eadf524..e26b697f793 100644 --- a/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c +++ b/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c @@ -587,9 +587,8 @@ _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = { ((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) - (char *)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHdxLNA5G"}, {"ed",_ID_U8,SINGULAR,0,0,0, - (((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) + - sizeof(uint16)) - (char *)&nvDefaults.tables.hwCalValues.calData), - "nv_TxBBFSel9MHz"}, + ((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) - + (char *)&nvDefaults.tables.hwCalValues.calData),"nv_TxBBFSel9MHz"}, {"ee",_ID_U8,SINGULAR,0,0,0, ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam2) - (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam2"},