mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

Staging: bcm: Change order in if conditions to make more readable in nvm.c

Browse source 
This patch changes the order of several if conditions
to make the code more readable.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kevin McKinney 2012-06-19 20:14:55 -04:00 committed by Greg Kroah-Hartman
parent a2a7ef06de
commit 85ba24d395
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/bcm/nvm.c
View file

@ -339,7 +339,7 @@ int BeceemEEPROMBulkRead(struct bcm_mini_adapter *Adapter,
* read function to make the access faster. * read function to make the access faster.
* We read 4 Dwords of data * We read 4 Dwords of data
*/ */
if (0 == ReadBeceemEEPROMBulk(Adapter, uiOffset, &uiData[0], 4)) { if (ReadBeceemEEPROMBulk(Adapter, uiOffset, &uiData[0], 4) == 0) {
memcpy(pcBuff + uiIndex, &uiData[0], MAX_RW_SIZE); memcpy(pcBuff + uiIndex, &uiData[0], MAX_RW_SIZE);
uiOffset += MAX_RW_SIZE; uiOffset += MAX_RW_SIZE;
uiBytesRemaining -= MAX_RW_SIZE; uiBytesRemaining -= MAX_RW_SIZE;
@ -349,7 +349,7 @@ int BeceemEEPROMBulkRead(struct bcm_mini_adapter *Adapter,
mdelay(3); /* sleep for a while before retry... */ mdelay(3); /* sleep for a while before retry... */
} }
} else if (uiBytesRemaining >= 4) { } else if (uiBytesRemaining >= 4) {
if (0 == ReadBeceemEEPROM(Adapter, uiOffset, &uiData[0])) { if (ReadBeceemEEPROM(Adapter, uiOffset, &uiData[0]) == 0) {
memcpy(pcBuff + uiIndex, &uiData[0], 4); memcpy(pcBuff + uiIndex, &uiData[0], 4);
uiOffset += 4; uiOffset += 4;
uiBytesRemaining -= 4; uiBytesRemaining -= 4;
@ -362,7 +362,7 @@ int BeceemEEPROMBulkRead(struct bcm_mini_adapter *Adapter,
/* Handle the reads less than 4 bytes... */ /* Handle the reads less than 4 bytes... */
PUCHAR pCharBuff = (PUCHAR)pBuffer; PUCHAR pCharBuff = (PUCHAR)pBuffer;
pCharBuff += uiIndex; pCharBuff += uiIndex;
if (0 == ReadBeceemEEPROM(Adapter, uiOffset, &uiData[0])) { if (ReadBeceemEEPROM(Adapter, uiOffset, &uiData[0]) == 0) {
memcpy(pCharBuff, &uiData[0], uiBytesRemaining); /* copy only bytes requested. */ memcpy(pCharBuff, &uiData[0], uiBytesRemaining); /* copy only bytes requested. */
uiBytesRemaining = 0; uiBytesRemaining = 0;
} else { } else {
@ -515,7 +515,7 @@ static unsigned int BcmGetEEPROMSize(struct bcm_mini_adapter *Adapter)
* EEPROM may not be present or not programmed * EEPROM may not be present or not programmed
*/ */
uiData = 0xBABEFACE; uiData = 0xBABEFACE;
if (0 == BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&uiData, 0, 4, TRUE)) { if (BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&uiData, 0, 4, TRUE) == 0) {
uiData = 0; uiData = 0;
for (uiIndex = 2; uiIndex <= 256; uiIndex *= 2) { for (uiIndex = 2; uiIndex <= 256; uiIndex *= 2) {
BeceemEEPROMBulkRead(Adapter, &uiData, uiIndex * 1024, 4); BeceemEEPROMBulkRead(Adapter, &uiData, uiIndex * 1024, 4);