xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mwifiex: rename mwifiex_free_adapter() routine in init.c

Browse Source 
We have two different static routines with name
mwifiex_free_adapter(). The routine in main.c actually frees the
adapter structure.

We will rename other routine in init.c to mwifiex_adapter_cleanup()
to avoid confusion.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Amitkumar Karwar
2013-05-17 17:50:18 -07:00
committed by John W. Linville
parent 78e578c5b4
commit c56ecf5a7f
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/mwifiex/init.c
View File

@@ -447,17 +447,16 @@ static void mwifiex_free_lock_list(struct mwifiex_adapter *adapter)
} }
/* /*
* This function frees the adapter structure. * This function performs cleanup for adapter structure.
* *
* The freeing operation is done recursively, by canceling all * The cleanup is done recursively, by canceling all pending
* pending commands, freeing the member buffers previously * commands, freeing the member buffers previously allocated
* allocated (command buffers, scan table buffer, sleep confirm * (command buffers, scan table buffer, sleep confirm command
* command buffer), stopping the timers and calling the cleanup * buffer), stopping the timers and calling the cleanup routines
* routines for every interface, before the actual adapter * for every interface.
* structure is freed.
*/ */
static void static void
mwifiex_free_adapter(struct mwifiex_adapter *adapter) mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
{ {
if (!adapter) { if (!adapter) {
pr_err("%s: adapter is NULL\n", __func__); pr_err("%s: adapter is NULL\n", __func__);
@@ -733,8 +732,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
} }
} }
/* Free adapter structure */ mwifiex_adapter_cleanup(adapter);
mwifiex_free_adapter(adapter);
spin_unlock_irqrestore(&adapter->mwifiex_lock, flags); spin_unlock_irqrestore(&adapter->mwifiex_lock, flags);