diff options
| author |   mike.rapoport@gmail.com <mike.rapoport@gmail.com> | 2010-10-13 00:09:07 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-14 12:24:35 -0700 |
| commit | 7383141b0334c0ff670c5c8c3e5f5540229e4ac6 (patch) | |
| tree | 91286503d0f7795a3aa4f8ace36e3142ebb96937 /drivers/staging/brcm80211/util/hnddma.c | |
| parent | staging: brcm80211: brcmfmac: bug fix - scan result report (diff) | |
| download | linux-dev-7383141b0334c0ff670c5c8c3e5f5540229e4ac6.tar.xz linux-dev-7383141b0334c0ff670c5c8c3e5f5540229e4ac6.zip | |
staging: brcm80211: remove OSL_DELAY
and use udelay and mdelay instead
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util/hnddma.c')
| -rw-r--r-- | drivers/staging/brcm80211/util/hnddma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c index 716ef25236bd..6f26abc196be 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/util/hnddma.c @@ -1004,7 +1004,7 @@ static void *BCMFASTPATH _dma_rx(dma_info_t *di) #if defined(__mips__) if (!len) { while (!(len = *(u16 *) OSL_UNCACHED(PKTDATA(head)))) - OSL_DELAY(1); + udelay(1); *(u16 *) PKTDATA(head) = htol16((u16) len); } @@ -1599,7 +1599,7 @@ static bool dma32_txreset(dma_info_t *di) XS_XS_DISABLED), 10000); /* wait for the last transaction to complete */ - OSL_DELAY(300); + udelay(300); return status == XS_XS_DISABLED; } @@ -1649,7 +1649,7 @@ static bool dma32_txsuspendedidle(dma_info_t *di) if ((R_REG(di->osh, &di->d32txregs->status) & XS_XS_MASK) != XS_XS_IDLE) return 0; - OSL_DELAY(2); + udelay(2); return ((R_REG(di->osh, &di->d32txregs->status) & XS_XS_MASK) == XS_XS_IDLE); } @@ -2162,7 +2162,7 @@ static bool dma64_txreset(dma_info_t *di) != D64_XS0_XS_DISABLED), 10000); /* wait for the last transaction to complete */ - OSL_DELAY(300); + udelay(300); return status == D64_XS0_XS_DISABLED; } |