From: Glen Lee <glen.lee@atmel.com>
Date: Tue, 27 Oct 2015 09:27:42 +0000 (+0900)
Subject: staging: wilc1000: wilc_wlan_handle_rxq: add new argument and use wilc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39ce4d3d733a54162dc833f6004483438a606026;p=linux-beck.git

staging: wilc1000: wilc_wlan_handle_rxq: add new argument and use wilc

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>
---

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 5141fe09e976..4fc88efac1fa 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -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)