]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
wl1271: Removed duplicate code from module remove function.
authorTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Thu, 18 Mar 2010 10:26:42 +0000 (12:26 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Mar 2010 20:50:24 +0000 (16:50 -0400)
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>
drivers/net/wireless/wl12xx/wl1271_sdio.c

index 0478919138d47f3611ab8ee7d824a56be8ea24df..99b5b3f7a92c8d23753a4f31220decec832c666e 100644 (file)
@@ -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 = {