diff options
| author |   Roland Vossen <rvossen@broadcom.com> | 2011-07-06 00:02:52 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 19:47:51 -0700 |
| commit | fbf6222d93d2656385f480a3b725684a802e0cd0 (patch) | |
| tree | ec5829d9d3b05ab80418802ec8ba7572d4fc8631 /drivers/staging/brcm80211 | |
| parent | staging: brcm80211: moved fullmac definitions from .h to .c files (diff) | |
| download | linux-dev-fbf6222d93d2656385f480a3b725684a802e0cd0.tar.xz linux-dev-fbf6222d93d2656385f480a3b725684a802e0cd0.zip | |
staging: brcm80211: removed #ifdef SDIOH_API_ACCESS_RETRY_LIMIT
SDIOH_API_ACCESS_RETRY_LIMIT is always defined.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index c9e20e1f9368..f4e72ed126b0 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -189,26 +189,20 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, int *err) { int status; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT s32 retry = 0; -#endif u8 data = 0; if (!card) card = l_card; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT do { if (retry) /* wait for 1 ms till bus get settled down */ udelay(1000); -#endif status = brcmf_sdioh_cfg_read(card->sdioh, fnc_num, addr, (u8 *) &data); -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT } while (status != 0 && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); -#endif if (err) *err = status; @@ -223,25 +217,19 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, u8 data, int *err) { int status; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT s32 retry = 0; -#endif if (!card) card = l_card; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT do { if (retry) /* wait for 1 ms till bus get settled down */ udelay(1000); -#endif status = brcmf_sdioh_cfg_write(card->sdioh, fnc_num, addr, (u8 *) &data); -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT } while (status != 0 && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); -#endif if (err) *err = status; |