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

Commit a52dd17d authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcm80211: fmac: rename wait queue name to match using function 



The wait queue request_packet_wait was used in request_chain function
and for sake of consistency it has been renamed to request_chain_wait.

Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8054321b

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

+6 −2
Original line number Diff line number Diff line
@@ -229,6 +229,10 @@ brcmf_sdioh_request_data(struct brcmf_sdio_dev *sdiodev, uint write, bool fifo, 
	return err_ret;

}



/*

 * This function takes a queue of packets. The packets on the queue

 * are assumed to be properly aligned by the caller.

 */

int

brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,

			  uint write, uint func, uint addr,
@@ -242,7 +246,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, 


	brcmf_dbg(TRACE, "Enter\n");



	brcmf_pm_resume_wait(sdiodev, &sdiodev->request_packet_wait);

	brcmf_pm_resume_wait(sdiodev, &sdiodev->request_chain_wait);

	if (brcmf_pm_resume_error(sdiodev))

		return -EIO;
@@ -478,7 +482,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
		atomic_set(&sdiodev->suspend, false);

		init_waitqueue_head(&sdiodev->request_byte_wait);

		init_waitqueue_head(&sdiodev->request_word_wait);

		init_waitqueue_head(&sdiodev->request_packet_wait);

		init_waitqueue_head(&sdiodev->request_chain_wait);

		init_waitqueue_head(&sdiodev->request_buffer_wait);

	}

drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ struct brcmf_sdio_dev { 
	atomic_t suspend;		/* suspend flag */

	wait_queue_head_t request_byte_wait;

	wait_queue_head_t request_word_wait;

	wait_queue_head_t request_packet_wait;

	wait_queue_head_t request_chain_wait;

	wait_queue_head_t request_buffer_wait;



};