diff options
| author | Xinming Hu <huxm@marvell.com> | 2016-12-14 19:40:50 +0530 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-01-12 16:49:18 +0200 |
| commit | a7513a4fa9193714b1b02aaa8836af743ccd938d (patch) | |
| tree | 8a3b57c84ba5ab5a07293738dc25323a492b25c1 /drivers/net/wireless/marvell | |
| parent | c742e623e9415d3e1e5af00470ae5086fa6dd233 (diff) | |
mwifiex: get rid of __mwifiex_sdio_remove helper
__mwifiex_sdio_remove helper is not needed after
our enhancements in SDIO card reset.
Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/sdio.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index b3aca10a71f2..0fda87a7441d 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -370,7 +370,7 @@ static int mwifiex_check_winner_status(struct mwifiex_adapter *adapter) * This function removes the interface and frees up the card structure. */ static void -__mwifiex_sdio_remove(struct sdio_func *func) +mwifiex_sdio_remove(struct sdio_func *func) { struct sdio_mmc_card *card; struct mwifiex_adapter *adapter; @@ -388,6 +388,8 @@ __mwifiex_sdio_remove(struct sdio_func *func) if (!adapter || !adapter->priv_num) return; + cancel_work_sync(&sdio_work); + mwifiex_dbg(adapter, INFO, "info: SDIO func num=%d\n", func->num); ret = mwifiex_sdio_read_fw_status(adapter, &firmware_stat); @@ -402,13 +404,6 @@ __mwifiex_sdio_remove(struct sdio_func *func) mwifiex_remove_card(adapter); } -static void -mwifiex_sdio_remove(struct sdio_func *func) -{ - cancel_work_sync(&sdio_work); - __mwifiex_sdio_remove(func); -} - /* * SDIO suspend. * |