From patchwork Tue Oct 13 10:49:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7383251 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 2293F9F36A for ; Tue, 13 Oct 2015 10:52:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5630C207D7 for ; Tue, 13 Oct 2015 10:52:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61843207D0 for ; Tue, 13 Oct 2015 10:52:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932277AbbJMKw2 (ORCPT ); Tue, 13 Oct 2015 06:52:28 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:2829 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932235AbbJMKw1 (ORCPT ); Tue, 13 Oct 2015 06:52:27 -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:24 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 17/54] staging: wilc1000: rename pu8IEs of struct scan_attr Date: Tue, 13 Oct 2015 19:49:42 +0900 Message-ID: <1444733419-17679-17-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 pu8IEs of struct scan_attr to ies to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho --- drivers/staging/wilc1000/host_interface.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 205be22..4a33d16 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -100,7 +100,7 @@ struct scan_attr { u8 type; u8 *ch_freq_list; u8 ch_list_len; - u8 *pu8IEs; + u8 *ies; size_t IEsLen; wilc_scan_result pfScanResult; void *pvUserArg; @@ -891,7 +891,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv, { strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE; strWIDList[u32WidsCount].type = WID_BIN_DATA; - strWIDList[u32WidsCount].val = pstrHostIFscanAttr->pu8IEs; + strWIDList[u32WidsCount].val = pstrHostIFscanAttr->ies; strWIDList[u32WidsCount].size = pstrHostIFscanAttr->IEsLen; u32WidsCount++; } @@ -948,9 +948,9 @@ ERRORHANDLER: pstrHostIFscanAttr->ch_freq_list = NULL; } - if (pstrHostIFscanAttr->pu8IEs != NULL) { - kfree(pstrHostIFscanAttr->pu8IEs); - pstrHostIFscanAttr->pu8IEs = NULL; + if (pstrHostIFscanAttr->ies != NULL) { + kfree(pstrHostIFscanAttr->ies); + pstrHostIFscanAttr->ies = NULL; } if (pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo != NULL) { kfree(pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo); @@ -4067,9 +4067,8 @@ s32 host_int_scan(struct host_if_drv *hif_drv, u8 u8ScanSource, 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); - memcpy(msg.body.scan_info.pu8IEs, - pu8IEs, IEsLen); + msg.body.scan_info.ies = kmalloc(IEsLen, GFP_KERNEL); + memcpy(msg.body.scan_info.ies, pu8IEs, IEsLen); s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg)); if (s32Error) {