Commit 7383141b authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove OSL_DELAY 



and use udelay and mdelay instead

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5dc56c9f

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, u32 addr, int *err) 
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT

	do {

		if (retry)	/* wait for 1 ms till bus get settled down */

			OSL_DELAY(1000);

			udelay(1000);

#endif

		status =

		    sdioh_cfg_read(bcmsdh->sdioh, fnc_num, addr,
@@ -233,7 +233,7 @@ bcmsdh_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err) 
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT

	do {

		if (retry)	/* wait for 1 ms till bus get settled down */

			OSL_DELAY(1000);

			udelay(1000);

#endif

		status =

		    sdioh_cfg_write(bcmsdh->sdioh, fnc_num, addr,

drivers/staging/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ typedef struct dhd_pub { 
#define SPINWAIT_SLEEP(a, exp, us)  do { \

		uint countdown = (us) + 9; \

		while ((exp) && (countdown >= 10)) { \

			OSL_DELAY(10);  \

			udelay(10);  \

			countdown -= 10;  \

		} \

	} while (0)

drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ void dhd_customer_gpio_wlan_ctrl(int onoff) 
		bcm_wlan_power_on(1);

#endif				/* CUSTOMER_HW */

		/* Lets customer power to get stable */

		OSL_DELAY(200);

		udelay(200);

		break;

	}

}

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ int dhd_timeout_expired(dhd_timeout_t *tmo) 
	tmo->elapsed += tmo->increment;



	if (tmo->increment < tmo->tick) {

		OSL_DELAY(tmo->increment);

		udelay(tmo->increment);

		tmo->increment *= 2;

		if (tmo->increment > tmo->tick)

			tmo->increment = tmo->tick;

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -5271,7 +5271,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva, 
		/* Now request ALP be put on the bus */

		bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR,

				 DHD_INIT_CLKCTL2, &err);

		OSL_DELAY(65);

		udelay(65);



		for (fn = 0; fn <= numfn; fn++) {

			cis[fn] = MALLOC(osh, SBSDIO_CIS_SIZE_LIMIT);