From patchwork Wed Oct 28 06:59:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Lee X-Patchwork-Id: 7506931 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB361BEEA4 for ; Wed, 28 Oct 2015 06:59:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B5BE2081D for ; Wed, 28 Oct 2015 06:59:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 201EC20818 for ; Wed, 28 Oct 2015 06:59:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755470AbbJ1G7P (ORCPT ); Wed, 28 Oct 2015 02:59:15 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:41799 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755291AbbJ1G7O (ORCPT ); Wed, 28 Oct 2015 02:59:14 -0400 Received: from glen-ubuntu.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Wed, 28 Oct 2015 07:59:10 +0100 From: Glen Lee To: CC: , , , , , , , , Subject: [PATCH 16/80] staging: wilc1000: rename u8RemainOnChan_pendingreq of struct host_if_drv Date: Wed, 28 Oct 2015 15:59:36 +0900 Message-ID: <1446015640-29398-16-git-send-email-glen.lee@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446015640-29398-1-git-send-email-glen.lee@atmel.com> References: <1446015640-29398-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 From: Leo Kim This patch renames u8RemainOnChan_pendingreq of struct host_if_drv to remain_on_ch_pending to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Glen Lee --- drivers/staging/wilc1000/host_interface.c | 10 +++++----- drivers/staging/wilc1000/host_interface.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index dd09152..5a2cae2 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -2476,7 +2476,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, u8 u8remain_on_chan_flag; struct wid wid; - if (!hif_drv->u8RemainOnChan_pendingreq) { + if (!hif_drv->remain_on_ch_pending) { hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid; hif_drv->remain_on_ch.pRemainOnChanExpired = pstrHostIfRemainOnChan->pRemainOnChanExpired; hif_drv->remain_on_ch.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady; @@ -2488,7 +2488,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, if (hif_drv->usr_scan_req.pfUserScanResult) { PRINT_INFO(GENERIC_DBG, "Required to remain on chan while scanning return\n"); - hif_drv->u8RemainOnChan_pendingreq = 1; + hif_drv->remain_on_ch_pending = 1; result = -EBUSY; goto ERRORHANDLER; } @@ -2535,8 +2535,8 @@ ERRORHANDLER: if (hif_drv->remain_on_ch.pRemainOnChanReady) hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid); - if (hif_drv->u8RemainOnChan_pendingreq) - hif_drv->u8RemainOnChan_pendingreq = 0; + if (hif_drv->remain_on_ch_pending) + hif_drv->remain_on_ch_pending = 0; } return result; @@ -2886,7 +2886,7 @@ static int hostIFthread(void *pvArg) Handle_ScanDone(msg.drv, SCAN_EVENT_DONE); - if (hif_drv->u8RemainOnChan_pendingreq) + if (hif_drv->remain_on_ch_pending) Handle_RemainOnChan(msg.drv, &msg.body.remain_on_ch); break; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index ea47a0d..8f80497 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -295,7 +295,7 @@ struct host_if_drv { struct user_scan_req usr_scan_req; struct user_conn_req usr_conn_req; struct remain_ch remain_on_ch; - u8 u8RemainOnChan_pendingreq; + u8 remain_on_ch_pending; u64 u64P2p_MgmtTimeout; u8 u8P2PConnect;