Skip to content

Commit

Permalink
Staging: bcm: Use udelay instead of msleep for delays in nvm.c
Browse files Browse the repository at this point in the history
This patch uses udelay instead of msleep for delays
because msleep can sleep up to 20ms for any value
less than 20.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent 7dcc132 commit 6788d7d
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/staging/bcm/nvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static UCHAR ReadEEPROMStatusRegister(struct bcm_mini_adapter *Adapter)
return uiData;
}
if (!(dwRetries%RETRIES_PER_DELAY))
msleep(1);
udelay(1000);
uiStatus = 0 ;
}
return uiData;
Expand Down Expand Up @@ -195,7 +195,7 @@ INT ReadBeceemEEPROMBulk(struct bcm_mini_adapter *Adapter,
}

if (!(dwRetries%RETRIES_PER_DELAY))
msleep(1);
udelay(1000);
}

for (dwIndex = 0; dwIndex < dwNumWords; dwIndex++) {
Expand Down Expand Up @@ -577,7 +577,7 @@ static INT FlashSectorErase(struct bcm_mini_adapter *Adapter,
* the sector erase cycle is 500 ms to 40000 msec. hence sleeping 10 ms
* won't hamper performance in any case.
*/
msleep(10);
udelay(10000);
} while ((uiStatus & 0x1) && (iRetries < 400));

if (uiStatus & 0x1) {
Expand Down Expand Up @@ -654,7 +654,7 @@ static INT flashByteWrite(struct bcm_mini_adapter *Adapter,
}
iRetries--;
if (iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
msleep(1);
udelay(1000);

} while ((uiStatus & 0x1) && (iRetries > 0));

Expand Down Expand Up @@ -734,7 +734,7 @@ static INT flashWrite(struct bcm_mini_adapter *Adapter,
* Hence current implementation cycle will intoduce no delay in current path
*/
if (iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
msleep(1);
udelay(1000);
} while ((uiStatus & 0x1) && (iRetries > 0));

if (uiStatus & 0x1) {
Expand Down Expand Up @@ -811,7 +811,7 @@ static INT flashByteWriteStatus(struct bcm_mini_adapter *Adapter,

iRetries--;
if (iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
msleep(1);
udelay(1000);

} while ((uiStatus & 0x1) && (iRetries > 0));

Expand Down Expand Up @@ -886,7 +886,7 @@ static INT flashWriteStatus(struct bcm_mini_adapter *Adapter,
* Hence current implementation cycle will intoduce no delay in current path
*/
if (iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
msleep(1);
udelay(1000);

} while ((uiStatus & 0x1) && (iRetries > 0));

Expand Down Expand Up @@ -1657,7 +1657,7 @@ static INT BeceemEEPROMWritePage(struct bcm_mini_adapter *Adapter, UINT uiData[]
}

if (!(uiRetries%RETRIES_PER_DELAY))
msleep(1);
udelay(1000);

uiStatus = 0;
rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
Expand Down Expand Up @@ -1698,7 +1698,7 @@ static INT BeceemEEPROMWritePage(struct bcm_mini_adapter *Adapter, UINT uiData[]
}
uiEpromStatus = 0;
if (!(uiRetries%RETRIES_PER_DELAY))
msleep(1);
udelay(1000);
}

return STATUS_SUCCESS;
Expand Down

0 comments on commit 6788d7d

Please sign in to comment.