diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-11-22 20:21:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-28 14:43:34 -0500 |
| commit | a52dd17d20be1fb6a111468f3ca8bfa0af7c0903 (patch) | |
| tree | d0ef2c95ce78df64f45c3119dca685cc20407a04 /drivers/net/wireless/brcm80211/brcmfmac | |
| parent | 8054321b7cb8c685f21762268b20dc590dab2a8d (diff) | |
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: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 8 | ||||
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c index ccb32c01d527..adee3057d330 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | |||
| @@ -229,6 +229,10 @@ brcmf_sdioh_request_data(struct brcmf_sdio_dev *sdiodev, uint write, bool fifo, | |||
| 229 | return err_ret; | 229 | return err_ret; |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | /* | ||
| 233 | * This function takes a queue of packets. The packets on the queue | ||
| 234 | * are assumed to be properly aligned by the caller. | ||
| 235 | */ | ||
| 232 | int | 236 | int |
| 233 | brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, | 237 | brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, |
| 234 | uint write, uint func, uint addr, | 238 | uint write, uint func, uint addr, |
| @@ -242,7 +246,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, | |||
| 242 | 246 | ||
| 243 | brcmf_dbg(TRACE, "Enter\n"); | 247 | brcmf_dbg(TRACE, "Enter\n"); |
| 244 | 248 | ||
| 245 | brcmf_pm_resume_wait(sdiodev, &sdiodev->request_packet_wait); | 249 | brcmf_pm_resume_wait(sdiodev, &sdiodev->request_chain_wait); |
| 246 | if (brcmf_pm_resume_error(sdiodev)) | 250 | if (brcmf_pm_resume_error(sdiodev)) |
| 247 | return -EIO; | 251 | return -EIO; |
| 248 | 252 | ||
| @@ -478,7 +482,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, | |||
| 478 | atomic_set(&sdiodev->suspend, false); | 482 | atomic_set(&sdiodev->suspend, false); |
| 479 | init_waitqueue_head(&sdiodev->request_byte_wait); | 483 | init_waitqueue_head(&sdiodev->request_byte_wait); |
| 480 | init_waitqueue_head(&sdiodev->request_word_wait); | 484 | init_waitqueue_head(&sdiodev->request_word_wait); |
| 481 | init_waitqueue_head(&sdiodev->request_packet_wait); | 485 | init_waitqueue_head(&sdiodev->request_chain_wait); |
| 482 | init_waitqueue_head(&sdiodev->request_buffer_wait); | 486 | init_waitqueue_head(&sdiodev->request_buffer_wait); |
| 483 | } | 487 | } |
| 484 | 488 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h index 1e4a0bb260b6..4e501f8a00f2 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h | |||
| @@ -132,7 +132,7 @@ struct brcmf_sdio_dev { | |||
| 132 | atomic_t suspend; /* suspend flag */ | 132 | atomic_t suspend; /* suspend flag */ |
| 133 | wait_queue_head_t request_byte_wait; | 133 | wait_queue_head_t request_byte_wait; |
| 134 | wait_queue_head_t request_word_wait; | 134 | wait_queue_head_t request_word_wait; |
| 135 | wait_queue_head_t request_packet_wait; | 135 | wait_queue_head_t request_chain_wait; |
| 136 | wait_queue_head_t request_buffer_wait; | 136 | wait_queue_head_t request_buffer_wait; |
| 137 | 137 | ||
| 138 | }; | 138 | }; |