From patchwork Tue Oct 13 10:49:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7383231 X-Patchwork-Delegate: kvalo@adurom.com 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 7EDF9BEEA4 for ; Tue, 13 Oct 2015 10:52:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A1B7207D7 for ; Tue, 13 Oct 2015 10:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9475D207D0 for ; Tue, 13 Oct 2015 10:52:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbbJMKwP (ORCPT ); Tue, 13 Oct 2015 06:52:15 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:2779 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752321AbbJMKwP (ORCPT ); Tue, 13 Oct 2015 06:52:15 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.30) with Microsoft SMTP Server id 14.3.235.1; Tue, 13 Oct 2015 12:52:11 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 15/54] staging: wilc1000: rename pu8ChnlFreqList of struct scan_attr Date: Tue, 13 Oct 2015 19:49:40 +0900 Message-ID: <1444733419-17679-15-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444733419-17679-1-git-send-email-tony.cho@atmel.com> References: <1444733419-17679-1-git-send-email-tony.cho@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, T_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 pu8ChnlFreqList of struct scan_attr to ch_freq_list to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho --- drivers/staging/wilc1000/host_interface.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 1e2a4ec..49097ad 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -98,7 +98,7 @@ struct key_attr { struct scan_attr { u8 src; u8 type; - u8 *pu8ChnlFreqList; + u8 *ch_freq_list; u8 u8ChnlListLen; u8 *pu8IEs; size_t IEsLen; @@ -905,16 +905,16 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv, strWIDList[u32WidsCount].id = WID_SCAN_CHANNEL_LIST; strWIDList[u32WidsCount].type = WID_BIN_DATA; - if (pstrHostIFscanAttr->pu8ChnlFreqList != NULL && pstrHostIFscanAttr->u8ChnlListLen > 0) { + if (pstrHostIFscanAttr->ch_freq_list != NULL && pstrHostIFscanAttr->u8ChnlListLen > 0) { int i; for (i = 0; i < pstrHostIFscanAttr->u8ChnlListLen; i++) { - if (pstrHostIFscanAttr->pu8ChnlFreqList[i] > 0) - pstrHostIFscanAttr->pu8ChnlFreqList[i] = pstrHostIFscanAttr->pu8ChnlFreqList[i] - 1; + if (pstrHostIFscanAttr->ch_freq_list[i] > 0) + pstrHostIFscanAttr->ch_freq_list[i] = pstrHostIFscanAttr->ch_freq_list[i] - 1; } } - strWIDList[u32WidsCount].val = pstrHostIFscanAttr->pu8ChnlFreqList; + strWIDList[u32WidsCount].val = pstrHostIFscanAttr->ch_freq_list; strWIDList[u32WidsCount].size = pstrHostIFscanAttr->u8ChnlListLen; u32WidsCount++; @@ -943,9 +943,9 @@ ERRORHANDLER: Handle_ScanDone(hif_drv, SCAN_EVENT_ABORTED); } - if (pstrHostIFscanAttr->pu8ChnlFreqList != NULL) { - kfree(pstrHostIFscanAttr->pu8ChnlFreqList); - pstrHostIFscanAttr->pu8ChnlFreqList = NULL; + if (pstrHostIFscanAttr->ch_freq_list != NULL) { + kfree(pstrHostIFscanAttr->ch_freq_list); + pstrHostIFscanAttr->ch_freq_list = NULL; } if (pstrHostIFscanAttr->pu8IEs != NULL) { @@ -4063,9 +4063,8 @@ s32 host_int_scan(struct host_if_drv *hif_drv, u8 u8ScanSource, msg.body.scan_info.pvUserArg = pvUserArg; msg.body.scan_info.u8ChnlListLen = u8ChnlListLen; - msg.body.scan_info.pu8ChnlFreqList = kmalloc(u8ChnlListLen, GFP_KERNEL); - memcpy(msg.body.scan_info.pu8ChnlFreqList, - pu8ChnlFreqList, u8ChnlListLen); + msg.body.scan_info.ch_freq_list = kmalloc(u8ChnlListLen, GFP_KERNEL); + memcpy(msg.body.scan_info.ch_freq_list, pu8ChnlFreqList, u8ChnlListLen); msg.body.scan_info.IEsLen = IEsLen; msg.body.scan_info.pu8IEs = kmalloc(IEsLen, GFP_KERNEL);