From patchwork Wed Sep 30 09:44:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7294181 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 A23539F32B for ; Wed, 30 Sep 2015 09:46:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3C5A2064F for ; Wed, 30 Sep 2015 09:46:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B35032064D for ; Wed, 30 Sep 2015 09:46:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932203AbbI3JqT (ORCPT ); Wed, 30 Sep 2015 05:46:19 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:13714 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932185AbbI3JqR (ORCPT ); Wed, 30 Sep 2015 05:46:17 -0400 Received: from tony-itx.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, 30 Sep 2015 11:45:52 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 03/32] staging: wilc1000: rename strHostIFscanAttr Date: Wed, 30 Sep 2015 18:44:20 +0900 Message-ID: <1443606289-25407-3-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443606289-25407-1-git-send-email-tony.cho@atmel.com> References: <1443606289-25407-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 This patch renames strHostIFscanAttr to scan_info in order to avoid CamelCase naming convention. Signed-off-by: Tony Cho --- drivers/staging/wilc1000/host_interface.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index be01de5..a039f04 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -414,7 +414,7 @@ struct sta_inactive_t { * @version 1.0 */ union message_body { - struct scan_attr strHostIFscanAttr; + struct scan_attr scan_info; struct connect_attr strHostIFconnectAttr; struct rcvd_net_info strRcvdNetworkInfo; struct rcvd_async_info strRcvdGnrlAsyncInfo; @@ -4099,7 +4099,7 @@ static int hostIFthread(void *pvArg) break; case HOST_IF_MSG_SCAN: - Handle_Scan(msg.drvHandler, &msg.body.strHostIFscanAttr); + Handle_Scan(msg.drvHandler, &msg.body.scan_info); break; case HOST_IF_MSG_CONNECT: @@ -5789,26 +5789,26 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, msg.id = HOST_IF_MSG_SCAN; if (pstrHiddenNetwork != NULL) { - msg.body.strHostIFscanAttr.strHiddenNetwork.pstrHiddenNetworkInfo = pstrHiddenNetwork->pstrHiddenNetworkInfo; - msg.body.strHostIFscanAttr.strHiddenNetwork.u8ssidnum = pstrHiddenNetwork->u8ssidnum; + msg.body.scan_info.strHiddenNetwork.pstrHiddenNetworkInfo = pstrHiddenNetwork->pstrHiddenNetworkInfo; + msg.body.scan_info.strHiddenNetwork.u8ssidnum = pstrHiddenNetwork->u8ssidnum; } else PRINT_D(HOSTINF_DBG, "pstrHiddenNetwork IS EQUAL TO NULL\n"); msg.drvHandler = hWFIDrv; - msg.body.strHostIFscanAttr.u8ScanSource = u8ScanSource; - msg.body.strHostIFscanAttr.u8ScanType = u8ScanType; - msg.body.strHostIFscanAttr.pfScanResult = ScanResult; - msg.body.strHostIFscanAttr.pvUserArg = pvUserArg; - - msg.body.strHostIFscanAttr.u8ChnlListLen = u8ChnlListLen; - msg.body.strHostIFscanAttr.pu8ChnlFreqList = kmalloc(u8ChnlListLen, GFP_KERNEL); /* will be deallocated by the receiving thread */ - memcpy(msg.body.strHostIFscanAttr.pu8ChnlFreqList, + msg.body.scan_info.u8ScanSource = u8ScanSource; + msg.body.scan_info.u8ScanType = u8ScanType; + msg.body.scan_info.pfScanResult = ScanResult; + msg.body.scan_info.pvUserArg = pvUserArg; + + msg.body.scan_info.u8ChnlListLen = u8ChnlListLen; + msg.body.scan_info.pu8ChnlFreqList = kmalloc(u8ChnlListLen, GFP_KERNEL); /* will be deallocated by the receiving thread */ + memcpy(msg.body.scan_info.pu8ChnlFreqList, pu8ChnlFreqList, u8ChnlListLen); - msg.body.strHostIFscanAttr.IEsLen = IEsLen; - msg.body.strHostIFscanAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */ - memcpy(msg.body.strHostIFscanAttr.pu8IEs, + msg.body.scan_info.IEsLen = IEsLen; + msg.body.scan_info.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */ + memcpy(msg.body.scan_info.pu8IEs, pu8IEs, IEsLen); /* send the message */