diff options
| author |   Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> | 2010-03-18 12:26:42 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-03-23 16:50:24 -0400 |
| commit | 801a673ed1b36fc0e7dd92d8bb0090a4dc26a7d0 (patch) | |
| tree | a46de7a247ae4546cc96326b353b5419d0a0dcab /drivers/net/wireless | |
| parent | wl1271: Added DEBUG_SDIO flag (diff) | |
| download | linux-dev-801a673ed1b36fc0e7dd92d8bb0090a4dc26a7d0.tar.xz linux-dev-801a673ed1b36fc0e7dd92d8bb0090a4dc26a7d0.zip | |
wl1271: Removed duplicate code from module remove function.
Removed duplicate code from wl1271_sdio module remove function. For
freeing stuff in the remove function wl1271_free_hw function is now
used.
Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_sdio.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index 0478919138d4..99b5b3f7a92c 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c @@ -248,20 +248,9 @@ static void __devexit wl1271_remove(struct sdio_func *func) { struct wl1271 *wl = sdio_get_drvdata(func); - ieee80211_unregister_hw(wl->hw); - free_irq(wl->irq, wl); - kfree(wl->target_mem_map); - vfree(wl->fw); - wl->fw = NULL; - kfree(wl->nvs); - wl->nvs = NULL; - - kfree(wl->fw_status); - kfree(wl->tx_res_if); - - ieee80211_free_hw(wl->hw); + wl1271_free_hw(wl); } static struct sdio_driver wl1271_sdio_driver = { |