staging: wilc1000: linux_wlan_mac_indicate: add argument and use wilc

This patch adds argument wilc and pass the function wilc. Use wilc instead of
g_linux_wlan and pd.

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 54e077dbbd8468fac99d11277384f7975a2af673..227dedbabe83dda495ab4d9bcc9c9c3fe4276435 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -348,24 +348,23 @@ int linux_wlan_lock_timeout(void *vp, u32 timeout)
        return error;
 }
 
-void linux_wlan_mac_indicate(int flag)
+void linux_wlan_mac_indicate(struct wilc *wilc, int flag)
 {
        /*I have to do it that way becuase there is no mean to encapsulate device pointer
         * as a parameter
         */
-       struct wilc *pd = g_linux_wlan;
        int status;
 
        if (flag == WILC_MAC_INDICATE_STATUS) {
                wilc_wlan_cfg_get_val(WID_STATUS, (unsigned char *)&status, 4);
-               if (pd->mac_status == WILC_MAC_STATUS_INIT) {
-                       pd->mac_status = status;
-                       up(&pd->sync_event);
+               if (wilc->mac_status == WILC_MAC_STATUS_INIT) {
+                       wilc->mac_status = status;
+                       up(&wilc->sync_event);
                } else {
-                       pd->mac_status = status;
+                       wilc->mac_status = status;
                }
 
-               if (pd->mac_status == WILC_MAC_STATUS_CONNECT) {        /* Connect */
+               if (wilc->mac_status == WILC_MAC_STATUS_CONNECT) {        /* Connect */
                }
 
        } else if (flag == WILC_MAC_INDICATE_SCAN) {

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 8aa335505fda2faaec474594d11590d82502dd4f..a828fab301f7e9520c68fd9b6a6493d89fde3b51 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -209,7 +209,7 @@ struct WILC_WFI_mon_priv {
 extern struct wilc *g_linux_wlan;
 extern struct net_device *WILC_WFI_devs[];
 void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset);
-void linux_wlan_mac_indicate(int flag);
+void linux_wlan_mac_indicate(struct wilc *wilc, int flag);
 void linux_wlan_rx_complete(void);
 void linux_wlan_dbg(u8 *buff);
 int linux_wlan_lock_timeout(void *vp, u32 timeout);

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 4fc88efac1fadbc18da691e0fe5b696ad7dfcc12..4fa956a79f06a19d8ba2ccfd8dc4218bf8e06cf2 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1199,10 +1199,10 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
                                                /**
                                                 *      Call back to indicate status...
                                                 **/
-                                               linux_wlan_mac_indicate(WILC_MAC_INDICATE_STATUS);
+                                               linux_wlan_mac_indicate(wilc, WILC_MAC_INDICATE_STATUS);
 
                                        } else if (rsp.type == WILC_CFG_RSP_SCAN) {
-                                               linux_wlan_mac_indicate(WILC_MAC_INDICATE_SCAN);
+                                               linux_wlan_mac_indicate(wilc, WILC_MAC_INDICATE_SCAN);
                                        }
                                }
                        }