staging: wilc1000: wilc_wlan_cleanup: add new argument struct net_device

This patch adds new function argument net_device and pass dev to the functions.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index bd9f715841638b343a17fe7d95433675c376e394..d193af871129628a22921c3681914aca18b1fb6b 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -927,7 +927,7 @@ void wilc1000_wlan_deinit(struct net_device *dev)
                wilc_wlan_stop();
 
                PRINT_D(INIT_DBG, "Deinitializing WILC Wlan\n");
-               wilc_wlan_cleanup();
+               wilc_wlan_cleanup(dev);
 #if (defined WILC_SDIO) && (!defined WILC_SDIO_IRQ_GPIO)
   #if defined(PLAT_ALLWINNER_A20) || defined(PLAT_ALLWINNER_A23) || defined(PLAT_ALLWINNER_A31)
                PRINT_D(INIT_DBG, "Disabling IRQ 2\n");
@@ -1178,7 +1178,7 @@ _fail_irq_init_:
 #endif
                wlan_deinitialize_threads(dev);
 _fail_wilc_wlan_:
-               wilc_wlan_cleanup();
+               wilc_wlan_cleanup(dev);
 _fail_locks_:
                wlan_deinit_locks(dev);
                PRINT_ER("WLAN Iinitialization FAILED\n");

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index babd941f0effabe66dbee693b674c2cbbd77be8e..747374291bdd9bf14e99f33de7bd7787b30c6924 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1647,7 +1647,7 @@ int wilc_wlan_stop(void)
        return ret;
 }
 
-void wilc_wlan_cleanup(void)
+void wilc_wlan_cleanup(struct net_device *dev)
 {
        wilc_wlan_dev_t *p = &g_wlan;
        struct txq_entry_t *tqe;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 79b35e670c52f0bd39b9dedb164042de0bfecba3..d0b244848cc497f23c60918814716f9297b5a1f9 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -302,7 +302,7 @@ int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size,
                              wilc_tx_complete_func_t func);
 int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount);
 void wilc_handle_isr(void *wilc);
-void wilc_wlan_cleanup(void);
+void wilc_wlan_cleanup(struct net_device *dev);
 int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
                      int commit, u32 drvHandler);
 int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler);