openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Xinming Hu 2016-12-14 19:40:50 +05:30 committed by Kalle Valo
parent c742e623e9
commit a7513a4fa9
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/marvell/mwifiex/sdio.c
View File

@ -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. * This function removes the interface and frees up the card structure.
*/ */
static void static void
__mwifiex_sdio_remove(struct sdio_func *func) mwifiex_sdio_remove(struct sdio_func *func)
{ {
struct sdio_mmc_card *card; struct sdio_mmc_card *card;
struct mwifiex_adapter *adapter; struct mwifiex_adapter *adapter;
@ -388,6 +388,8 @@ __mwifiex_sdio_remove(struct sdio_func *func)
if (!adapter || !adapter->priv_num) if (!adapter || !adapter->priv_num)
return; return;
cancel_work_sync(&sdio_work);
mwifiex_dbg(adapter, INFO, "info: SDIO func num=%d\n", func->num); mwifiex_dbg(adapter, INFO, "info: SDIO func num=%d\n", func->num);
ret = mwifiex_sdio_read_fw_status(adapter, &firmware_stat); ret = mwifiex_sdio_read_fw_status(adapter, &firmware_stat);
@ -402,13 +404,6 @@ __mwifiex_sdio_remove(struct sdio_func *func)
mwifiex_remove_card(adapter); mwifiex_remove_card(adapter);
} }
static void
mwifiex_sdio_remove(struct sdio_func *func)
{
cancel_work_sync(&sdio_work);
__mwifiex_sdio_remove(func);
}
/* /*
* SDIO suspend. * SDIO suspend.
* *