]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: wilc_wlan_handle_rxq: add new argument and use wilc
authorGlen Lee <glen.lee@atmel.com>
Tue, 27 Oct 2015 09:27:42 +0000 (18:27 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Oct 2015 23:08:47 +0000 (08:08 +0900)
This patch adds new argument struct wilc and use it instead of g_linux_wlan.
Pass wilc to the function as well.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_wlan.c

index 5141fe09e9763a6a1c15b07d7375e1b92b59ace6..4fc88efac1fadbc18da691e0fe5b696ad7dfcc12 100644 (file)
@@ -1107,7 +1107,7 @@ _end_:
        return ret;
 }
 
-static void wilc_wlan_handle_rxq(void)
+static void wilc_wlan_handle_rxq(struct wilc *wilc)
 {
        wilc_wlan_dev_t *p = &g_wlan;
        int offset = 0, size, has_packet = 0;
@@ -1122,7 +1122,7 @@ static void wilc_wlan_handle_rxq(void)
        do {
                if (p->quit) {
                        PRINT_D(RX_DBG, "exit 1st do-while due to Clean_UP function\n");
-                       up(&g_linux_wlan->cfg_event);
+                       up(&wilc->cfg_event);
                        break;
                }
                rqe = wilc_wlan_rxq_remove();
@@ -1194,7 +1194,7 @@ static void wilc_wlan_handle_rxq(void)
                                                 **/
                                                PRINT_D(RX_DBG, "p->cfg_seq_no = %d - rsp.seq_no = %d\n", p->cfg_seq_no, rsp.seq_no);
                                                if (p->cfg_seq_no == rsp.seq_no)
-                                                       up(&g_linux_wlan->cfg_event);
+                                                       up(&wilc->cfg_event);
                                        } else if (rsp.type == WILC_CFG_RSP_STATUS) {
                                                /**
                                                 *      Call back to indicate status...
@@ -1350,7 +1350,7 @@ _end_:
 #endif
                }
        }
-       wilc_wlan_handle_rxq();
+       wilc_wlan_handle_rxq(wilc);
 }
 
 void wilc_handle_isr(void *wilc)