aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2013-05-17 20:50:18 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-05-22 15:08:46 -0400
commitc56ecf5a7f0f670c0c445a3d2d0bd6c3eda7015c (patch)
tree56604dac6ed7c0848b0b5d2e42d19058adb78646 /drivers/net/wireless
parent78e578c5b43c4f274305075c68d055c8d6141fd5 (diff)
mwifiex: rename mwifiex_free_adapter() routine in init.c
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/mwifiex/init.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 9f44fda19db9..58e151edfa09 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -447,17 +447,16 @@ static void mwifiex_free_lock_list(struct mwifiex_adapter *adapter)
447} 447}
448 448
449/* 449/*
450 * This function frees the adapter structure. 450 * This function performs cleanup for adapter structure.
451 * 451 *
452 * The freeing operation is done recursively, by canceling all 452 * The cleanup is done recursively, by canceling all pending
453 * pending commands, freeing the member buffers previously 453 * commands, freeing the member buffers previously allocated
454 * allocated (command buffers, scan table buffer, sleep confirm 454 * (command buffers, scan table buffer, sleep confirm command
455 * command buffer), stopping the timers and calling the cleanup 455 * buffer), stopping the timers and calling the cleanup routines
456 * routines for every interface, before the actual adapter 456 * for every interface.
457 * structure is freed.
458 */ 457 */
459static void 458static void
460mwifiex_free_adapter(struct mwifiex_adapter *adapter) 459mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
461{ 460{
462 if (!adapter) { 461 if (!adapter) {
463 pr_err("%s: adapter is NULL\n", __func__); 462 pr_err("%s: adapter is NULL\n", __func__);
@@ -733,8 +732,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
733 } 732 }
734 } 733 }
735 734
736 /* Free adapter structure */ 735 mwifiex_adapter_cleanup(adapter);
737 mwifiex_free_adapter(adapter);
738 736
739 spin_unlock_irqrestore(&adapter->mwifiex_lock, flags); 737 spin_unlock_irqrestore(&adapter->mwifiex_lock, flags);
740 738