From patchwork Fri Oct 23 05:28:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Lee X-Patchwork-Id: 7470261 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 788F99F302 for ; Fri, 23 Oct 2015 05:27:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEB9F207B6 for ; Fri, 23 Oct 2015 05:27:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8BEF207B4 for ; Fri, 23 Oct 2015 05:27:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751712AbbJWF1Y (ORCPT ); Fri, 23 Oct 2015 01:27:24 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:51953 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212AbbJWF1X (ORCPT ); Fri, 23 Oct 2015 01:27:23 -0400 Received: from glen-ubuntu.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.30) with Microsoft SMTP Server id 14.3.235.1; Fri, 23 Oct 2015 07:27:16 +0200 From: Glen Lee To: CC: , , , , , , , , Subject: [PATCH 15/28] staging: wilc1000: wlan_deinit_locks: rename argument name and use it Date: Fri, 23 Oct 2015 14:28:31 +0900 Message-ID: <1445578124-31486-15-git-send-email-glen.lee@atmel.com> X-Mailer: git-send-email 1.9.1 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 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch renames nic to wilc and use it instead of g_linux_wlan. Signed-off-by: Glen Lee --- drivers/staging/wilc1000/linux_wlan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 4f9663d..2f1543d 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -95,7 +95,7 @@ static struct notifier_block g_dev_notifier = { */ static struct semaphore close_exit_sync; -static int wlan_deinit_locks(struct wilc *nic); +static int wlan_deinit_locks(struct wilc *wilc); static void wlan_deinitialize_threads(struct wilc *nic); extern void WILC_WFI_monitor_rx(u8 *buff, u32 size); extern void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size); @@ -977,14 +977,14 @@ int wlan_init_locks(struct net_device *dev) return 0; } -static int wlan_deinit_locks(struct wilc *nic) +static int wlan_deinit_locks(struct wilc *wilc) { PRINT_D(INIT_DBG, "De-Initializing Locks\n"); - if (&g_linux_wlan->hif_cs != NULL) + if (&wilc->hif_cs != NULL) mutex_destroy(&g_linux_wlan->hif_cs); - if (&g_linux_wlan->rxq_cs != NULL) + if (&wilc->rxq_cs != NULL) mutex_destroy(&g_linux_wlan->rxq_cs); return 0;