diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2013-05-17 17:50:18 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-22 15:08:46 -0400 |
| commit | c56ecf5a7f0f670c0c445a3d2d0bd6c3eda7015c (patch) | |
| tree | 56604dac6ed7c0848b0b5d2e42d19058adb78646 /drivers/net/wireless/mwifiex/init.c | |
| parent | 78e578c5b43c4f274305075c68d055c8d6141fd5 (diff) | |
| download | lwn-c56ecf5a7f0f670c0c445a3d2d0bd6c3eda7015c.tar.gz lwn-c56ecf5a7f0f670c0c445a3d2d0bd6c3eda7015c.zip | |
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/mwifiex/init.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/init.c | 18 |
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) } /* - * This function frees the adapter structure. + * This function performs cleanup for adapter structure. * - * The freeing operation is done recursively, by canceling all - * pending commands, freeing the member buffers previously - * allocated (command buffers, scan table buffer, sleep confirm - * command buffer), stopping the timers and calling the cleanup - * routines for every interface, before the actual adapter - * structure is freed. + * The cleanup is done recursively, by canceling all pending + * commands, freeing the member buffers previously allocated + * (command buffers, scan table buffer, sleep confirm command + * buffer), stopping the timers and calling the cleanup routines + * for every interface. */ static void -mwifiex_free_adapter(struct mwifiex_adapter *adapter) +mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter) { if (!adapter) { pr_err("%s: adapter is NULL\n", __func__); @@ -733,8 +732,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter) } } - /* Free adapter structure */ - mwifiex_free_adapter(adapter); + mwifiex_adapter_cleanup(adapter); spin_unlock_irqrestore(&adapter->mwifiex_lock, flags); |