Return-path: Received: from eusmtp01.atmel.com ([212.144.249.242]:52180 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848AbbJWF2X (ORCPT ); Fri, 23 Oct 2015 01:28:23 -0400 From: Glen Lee To: CC: , , , , , , , , Subject: [PATCH 25/28] staging: wilc1000: wilc_wlan_txq_get_next: add argument wilc Date: Fri, 23 Oct 2015 14:28:41 +0900 Message-ID: <1445578124-31486-25-git-send-email-glen.lee@atmel.com> (sfid-20151023_074700_001830_271C7672) In-Reply-To: <1445578124-31486-1-git-send-email-glen.lee@atmel.com> References: <1445578124-31486-1-git-send-email-glen.lee@atmel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: This patch adds new argument struct wilc and use wilc instead of g_linux_wlan. Signed-off-by: Glen Lee --- drivers/staging/wilc1000/wilc_wlan.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 5393b6f..e4e9c72 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -574,13 +574,14 @@ static struct txq_entry_t *wilc_wlan_txq_get_first(void) return tqe; } -static struct txq_entry_t *wilc_wlan_txq_get_next(struct txq_entry_t *tqe) +static struct txq_entry_t *wilc_wlan_txq_get_next(struct wilc *wilc, + struct txq_entry_t *tqe) { unsigned long flags; - spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags); + spin_lock_irqsave(&wilc->txq_spinlock, flags); tqe = tqe->next; - spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags); + spin_unlock_irqrestore(&wilc->txq_spinlock, flags); return tqe; @@ -887,7 +888,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount) i++; sum += vmm_sz; PRINT_D(TX_DBG, "sum = %d\n", sum); - tqe = wilc_wlan_txq_get_next(tqe); + tqe = wilc_wlan_txq_get_next(wl, tqe); } else { break; } -- 1.9.1