qcacld-2.0: Fix GCC 7.x warnings

7 files changed, 11 insertions, 7 deletions

diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
index 7b4a22f5d529..e850300c9294 100644
--- a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
+++ b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
@@ -16425,11 +16425,12 @@ static void hdd_state_info_dump(char **buf_ptr, uint16_t *size)
 
 	while (NULL != adapter_node && VOS_STATUS_SUCCESS == status) {
 		adapter = adapter_node->pAdapter;
-		if (adapter->dev)
+		if (adapter->dev) {
 			len += scnprintf(buf + len, *size - len,
 				"\n device name: %s", adapter->dev->name);
 		len += scnprintf(buf + len, *size - len,
 				"\n device_mode: %d", adapter->device_mode);
+		}
 		switch (adapter->device_mode) {
 		case WLAN_HDD_INFRA_STATION:
 		case WLAN_HDD_P2P_CLIENT:
diff --git a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limAssocUtils.c b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limAssocUtils.c
index 393294acbb8e..24e768d6adee 100644
--- a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -4431,10 +4431,11 @@ tSirRetStatus limStaSendAddBssPreAssoc( tpAniSirGlobal pMac, tANI_U8 updateEntry
                             GET_IE_LEN_IN_BSS(bssDescription->length),
                             pBeaconStruct);
 
-    if(pMac->lim.gLimProtectionControl != WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE)
+    if(pMac->lim.gLimProtectionControl != WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) {
         limDecideStaProtectionOnAssoc(pMac, pBeaconStruct, psessionEntry);
     vos_mem_copy(pAddBssParams->bssId, bssDescription->bssId,
                      sizeof(tSirMacAddr));
+    }
 
     // Fill in tAddBssParams selfMacAddr
     vos_mem_copy(pAddBssParams->selfMacAddr,
diff --git a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
index 6427a5073caf..96ea567980c2 100644
--- a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
+++ b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
@@ -1104,13 +1104,14 @@ __limIbssSearchAndDeletePeer(tpAniSirGlobal pMac,
 				 * Send DEL STA only if ADD STA
 				 * was success i.e staid is Valid.
 				*/
-				if (HAL_STA_INVALID_IDX != staIndex)
+				if (HAL_STA_INVALID_IDX != staIndex) {
 					limDelSta(pMac, pStaDs,
 						false /*asynchronous*/,
 						psessionEntry);
 				limDeleteDphHashEntry(pMac,
 							pStaDs->staAddr,
 							peerIdx, psessionEntry);
+				}
 				limReleasePeerIdx(pMac, peerIdx, psessionEntry);
 				/**
 				 * Send indication to upper layers only if ADD
diff --git a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limPropExtsUtils.c b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limPropExtsUtils.c
index 06e859ab4794..ec9c566ab275 100644
--- a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limPropExtsUtils.c
+++ b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limPropExtsUtils.c
@@ -212,11 +212,12 @@ limExtractApCapability(tpAniSirGlobal pMac, tANI_U8 *pIE, tANI_U16 ieLen,
              * adapt to it. Hence there is else condition check
              * for this if statement.
              */
-            if (pBeaconStruct->eseTxPwr.present)
+            if (pBeaconStruct->eseTxPwr.present) {
                  *localConstraint = pBeaconStruct->eseTxPwr.power_limit;
 
             psessionEntry->is_ese_version_ie_present =
                               pBeaconStruct->is_ese_ver_ie_present;
+            }
 #endif
             }
         }
diff --git a/drivers/staging/qcacld-2.0/CORE/SAP/src/sapFsm.c b/drivers/staging/qcacld-2.0/CORE/SAP/src/sapFsm.c
index 95c3d260fc69..f441aa992847 100644
--- a/drivers/staging/qcacld-2.0/CORE/SAP/src/sapFsm.c
+++ b/drivers/staging/qcacld-2.0/CORE/SAP/src/sapFsm.c
@@ -3132,7 +3132,7 @@ sapGotoStarting
     if (eHAL_STATUS_SUCCESS != halStatus)
         VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
         "%s: Failed to issue sme_RoamConnect", __func__);
-        return halStatus;
+    return halStatus;
 
 }// sapGotoStarting
 
diff --git a/drivers/staging/qcacld-2.0/CORE/SME/src/csr/csrApiRoam.c b/drivers/staging/qcacld-2.0/CORE/SME/src/csr/csrApiRoam.c
index da0163abbb6c..6694e0f61575 100644
--- a/drivers/staging/qcacld-2.0/CORE/SME/src/csr/csrApiRoam.c
+++ b/drivers/staging/qcacld-2.0/CORE/SME/src/csr/csrApiRoam.c
@@ -18696,7 +18696,7 @@ eHalStatus csrRoamOffloadScan(tpAniSirGlobal pMac, tANI_U8 sessionId,
                        vos_nv_getChannelEnabledState(*ChannelList),
                        *ChannelList,
                        num_channels);
-              ChannelList++;
+            ChannelList++;
         }
         pRequestBuf->ConnectedNetwork.ChannelCount = num_channels;
         /* If the profile changes as to what it was earlier, inform the
diff --git a/drivers/staging/qcacld-2.0/CORE/VOSS/src/vos_sched.c b/drivers/staging/qcacld-2.0/CORE/VOSS/src/vos_sched.c
index 7d9c5766f470..4df456e9f68d 100644
--- a/drivers/staging/qcacld-2.0/CORE/VOSS/src/vos_sched.c
+++ b/drivers/staging/qcacld-2.0/CORE/VOSS/src/vos_sched.c
@@ -1175,7 +1175,7 @@ VosWDThread
          * Process here and return without processing any SSR
          * related logic.
          */
-        break;
+       break;
       }
       /* Check for any Active Entry Points
        * If active, delay SSR until no entry point is active or