Commit fbf6222d authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

staging: brcm80211: removed #ifdef SDIOH_API_ACCESS_RETRY_LIMIT

SDIOH_API_ACCESS_RETRY_LIMIT is always defined.
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6aeea40f
...@@ -189,26 +189,20 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, ...@@ -189,26 +189,20 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_card *card, uint fnc_num, u32 addr,
int *err) int *err)
{ {
int status; int status;
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
s32 retry = 0; s32 retry = 0;
#endif
u8 data = 0; u8 data = 0;
if (!card) if (!card)
card = l_card; card = l_card;
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
do { do {
if (retry) /* wait for 1 ms till bus get settled down */ if (retry) /* wait for 1 ms till bus get settled down */
udelay(1000); udelay(1000);
#endif
status = status =
brcmf_sdioh_cfg_read(card->sdioh, fnc_num, addr, brcmf_sdioh_cfg_read(card->sdioh, fnc_num, addr,
(u8 *) &data); (u8 *) &data);
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
} while (status != 0 } while (status != 0
&& (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
#endif
if (err) if (err)
*err = status; *err = status;
...@@ -223,25 +217,19 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, ...@@ -223,25 +217,19 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_card *card, uint fnc_num, u32 addr,
u8 data, int *err) u8 data, int *err)
{ {
int status; int status;
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
s32 retry = 0; s32 retry = 0;
#endif
if (!card) if (!card)
card = l_card; card = l_card;
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
do { do {
if (retry) /* wait for 1 ms till bus get settled down */ if (retry) /* wait for 1 ms till bus get settled down */
udelay(1000); udelay(1000);
#endif
status = status =
brcmf_sdioh_cfg_write(card->sdioh, fnc_num, addr, brcmf_sdioh_cfg_write(card->sdioh, fnc_num, addr,
(u8 *) &data); (u8 *) &data);
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
} while (status != 0 } while (status != 0
&& (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
#endif
if (err) if (err)
*err = status; *err = status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment