Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd67dc83 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcmfmac: remove brcmf_sdbrcm_wait_for_event 



brcmf_sdbrcm_wait_for_event is now a one line function and only
used by brcmf_sdbrcm_bus_txctl. Intergrate the function call
wait_event_interruptible_timeout into brcmf_sdbrcm_bus_txctl.

Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 38b0b0dd

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+3 −8
Original line number Diff line number Diff line
@@ -1786,13 +1786,6 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes) 
	return rxcount;

}



static void

brcmf_sdbrcm_wait_for_event(struct brcmf_sdio *bus, bool *lockvar)

{

	wait_event_interruptible_timeout(bus->ctrl_wait, !*lockvar, HZ * 2);

	return;

}



static void

brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus)

{
@@ -2662,7 +2655,9 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen) 
		bus->ctrl_frame_buf = frame;

		bus->ctrl_frame_len = len;



		brcmf_sdbrcm_wait_for_event(bus, &bus->ctrl_frame_stat);

		wait_event_interruptible_timeout(bus->ctrl_wait,

						 !bus->ctrl_frame_stat,

						 msecs_to_jiffies(2000));



		if (!bus->ctrl_frame_stat) {

			brcmf_dbg(INFO, "ctrl_frame_stat == false\n");