From: Philip Worrall <philip.worrall@googlemail.com>
Date: Wed, 2 Mar 2011 14:34:41 +0000 (+0000)
Subject: Staging: vt6656: Clean up unneccessary braces in power.c
X-Git-Tag: MMI-PSA29.97-13-9~20521^2~338
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=036dba14d56fd3d43bab452625ec967c3f886fa4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: vt6656: Clean up unneccessary braces in power.c

Clean up some unnecessary braces for conditional statements
where a single statement will do.

Signed-off-by: Philip Worrall <philip.worrall@googlemail.com>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index fefd8e4e8a30..942f371eaf67 100644
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -159,9 +159,8 @@ void PSvDisablePowerSaving(void *hDeviceContext)
 	MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
 	pDevice->bEnablePSMode = FALSE;
 
-	if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) {
+	if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)
 		PSbSendNullPacket(pDevice);
-	}
 
 	pDevice->bPWBitOn = FALSE;
 	return;
@@ -281,12 +280,11 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
 	PSTxMgmtPacket pTxPacket = NULL;
 	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
 
-	if (pDevice->bLinkPass == FALSE) {
+	if (pDevice->bLinkPass == FALSE)
 		return FALSE;
-	}
 
 	if ((pDevice->bEnablePSMode == FALSE) &&
-		(pDevice->fTxDataInSleep == FALSE)){
+		(pDevice->fTxDataInSleep == FALSE)) {
 			return FALSE;
 	}
 
@@ -310,9 +308,8 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
 			));
 	}
 
-	if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
+	if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA)
 		pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_TODS(1));
-	}
 
 	memcpy(pTxPacket->p80211Header->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
 	memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
@@ -347,9 +344,8 @@ BOOL PSbIsNextTBTTWakeUp(void *hDeviceContext)
 	BOOL bWakeUp = FALSE;
 
 	if (pMgmt->wListenInterval >= 2) {
-		if (pMgmt->wCountToWakeUp == 0) {
+		if (pMgmt->wCountToWakeUp == 0)
 			pMgmt->wCountToWakeUp = pMgmt->wListenInterval;
-		}
 
 		pMgmt->wCountToWakeUp --;