From a7513a4fa9193714b1b02aaa8836af743ccd938d Mon Sep 17 00:00:00 2001 From: Xinming Hu Date: Wed, 14 Dec 2016 19:40:50 +0530 Subject: [PATCH] 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 Signed-off-by: Amitkumar Karwar Signed-off-by: Kalle Valo --- drivers/net/wireless/marvell/mwifiex/sdio.c | 11 +++-------- 1 file 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. * -- 2.20.1