diff options
author | Philip Worrall <philip.worrall@googlemail.com> | 2011-03-02 09:34:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-02 15:52:28 -0500 |
commit | 036dba14d56fd3d43bab452625ec967c3f886fa4 (patch) | |
tree | 4a4b67ad9f8b5c56e276fbe30519e1c81041e13f | |
parent | 7404eab294f3275233ceaa592e029bf41601ab78 (diff) |
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>
-rw-r--r-- | drivers/staging/vt6656/power.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c index fefd8e4e8a3..942f371eaf6 100644 --- a/drivers/staging/vt6656/power.c +++ b/drivers/staging/vt6656/power.c | |||
@@ -159,9 +159,8 @@ void PSvDisablePowerSaving(void *hDeviceContext) | |||
159 | MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN); | 159 | MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN); |
160 | pDevice->bEnablePSMode = FALSE; | 160 | pDevice->bEnablePSMode = FALSE; |
161 | 161 | ||
162 | if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) { | 162 | if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) |
163 | PSbSendNullPacket(pDevice); | 163 | PSbSendNullPacket(pDevice); |
164 | } | ||
165 | 164 | ||
166 | pDevice->bPWBitOn = FALSE; | 165 | pDevice->bPWBitOn = FALSE; |
167 | return; | 166 | return; |
@@ -281,12 +280,11 @@ BOOL PSbSendNullPacket(void *hDeviceContext) | |||
281 | PSTxMgmtPacket pTxPacket = NULL; | 280 | PSTxMgmtPacket pTxPacket = NULL; |
282 | PSMgmtObject pMgmt = &(pDevice->sMgmtObj); | 281 | PSMgmtObject pMgmt = &(pDevice->sMgmtObj); |
283 | 282 | ||
284 | if (pDevice->bLinkPass == FALSE) { | 283 | if (pDevice->bLinkPass == FALSE) |
285 | return FALSE; | 284 | return FALSE; |
286 | } | ||
287 | 285 | ||
288 | if ((pDevice->bEnablePSMode == FALSE) && | 286 | if ((pDevice->bEnablePSMode == FALSE) && |
289 | (pDevice->fTxDataInSleep == FALSE)){ | 287 | (pDevice->fTxDataInSleep == FALSE)) { |
290 | return FALSE; | 288 | return FALSE; |
291 | } | 289 | } |
292 | 290 | ||
@@ -310,9 +308,8 @@ BOOL PSbSendNullPacket(void *hDeviceContext) | |||
310 | )); | 308 | )); |
311 | } | 309 | } |
312 | 310 | ||
313 | if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { | 311 | if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) |
314 | pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_TODS(1)); | 312 | pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_TODS(1)); |
315 | } | ||
316 | 313 | ||
317 | memcpy(pTxPacket->p80211Header->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); | 314 | memcpy(pTxPacket->p80211Header->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); |
318 | memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN); | 315 | memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN); |
@@ -347,9 +344,8 @@ BOOL PSbIsNextTBTTWakeUp(void *hDeviceContext) | |||
347 | BOOL bWakeUp = FALSE; | 344 | BOOL bWakeUp = FALSE; |
348 | 345 | ||
349 | if (pMgmt->wListenInterval >= 2) { | 346 | if (pMgmt->wListenInterval >= 2) { |
350 | if (pMgmt->wCountToWakeUp == 0) { | 347 | if (pMgmt->wCountToWakeUp == 0) |
351 | pMgmt->wCountToWakeUp = pMgmt->wListenInterval; | 348 | pMgmt->wCountToWakeUp = pMgmt->wListenInterval; |
352 | } | ||
353 | 349 | ||
354 | pMgmt->wCountToWakeUp --; | 350 | pMgmt->wCountToWakeUp --; |
355 | 351 | ||