From patchwork Tue Oct 13 11:02:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7383551 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 30473BEEA4 for ; Tue, 13 Oct 2015 11:02:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CD482074E for ; Tue, 13 Oct 2015 11:02:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 390C02073D for ; Tue, 13 Oct 2015 11:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752700AbbJMLCf (ORCPT ); Tue, 13 Oct 2015 07:02:35 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:4727 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752327AbbJMLCe (ORCPT ); Tue, 13 Oct 2015 07:02:34 -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 13:02:30 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 47/54] staging: wilc1000: rename u32count of struct set_multicast Date: Tue, 13 Oct 2015 20:02:05 +0900 Message-ID: <1444734132-17858-2-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444734132-17858-1-git-send-email-tony.cho@atmel.com> References: <1444734132-17858-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 u32count of struct set_multicast to cnt to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho --- drivers/staging/wilc1000/host_interface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 7ea9e01..9cd42f7 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -141,7 +141,7 @@ struct beacon_attr { struct set_multicast { bool enabled; - u32 u32count; + u32 cnt; }; struct del_all_sta { @@ -2790,7 +2790,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *hif_drv, strWID.id = (u16)WID_SETUP_MULTICAST_FILTER; strWID.type = WID_BIN; - strWID.size = sizeof(struct set_multicast) + ((strHostIfSetMulti->u32count) * ETH_ALEN); + strWID.size = sizeof(struct set_multicast) + ((strHostIfSetMulti->cnt) * ETH_ALEN); strWID.val = kmalloc(strWID.size, GFP_KERNEL); if (strWID.val == NULL) goto ERRORHANDLER; @@ -2801,13 +2801,13 @@ static void Handle_SetMulticastFilter(struct host_if_drv *hif_drv, *pu8CurrByte++ = ((strHostIfSetMulti->enabled >> 16) & 0xFF); *pu8CurrByte++ = ((strHostIfSetMulti->enabled >> 24) & 0xFF); - *pu8CurrByte++ = (strHostIfSetMulti->u32count & 0xFF); - *pu8CurrByte++ = ((strHostIfSetMulti->u32count >> 8) & 0xFF); - *pu8CurrByte++ = ((strHostIfSetMulti->u32count >> 16) & 0xFF); - *pu8CurrByte++ = ((strHostIfSetMulti->u32count >> 24) & 0xFF); + *pu8CurrByte++ = (strHostIfSetMulti->cnt & 0xFF); + *pu8CurrByte++ = ((strHostIfSetMulti->cnt >> 8) & 0xFF); + *pu8CurrByte++ = ((strHostIfSetMulti->cnt >> 16) & 0xFF); + *pu8CurrByte++ = ((strHostIfSetMulti->cnt >> 24) & 0xFF); - if ((strHostIfSetMulti->u32count) > 0) - memcpy(pu8CurrByte, gau8MulticastMacAddrList, ((strHostIfSetMulti->u32count) * ETH_ALEN)); + if ((strHostIfSetMulti->cnt) > 0) + memcpy(pu8CurrByte, gau8MulticastMacAddrList, ((strHostIfSetMulti->cnt) * ETH_ALEN)); s32Error = send_config_pkt(SET_CFG, &strWID, 1, get_id_from_handler(hif_drv)); @@ -4913,7 +4913,7 @@ s32 host_int_setup_multicast_filter(struct host_if_drv *hif_drv, msg.drv = hif_drv; pstrMulticastFilterParam->enabled = bIsEnabled; - pstrMulticastFilterParam->u32count = u32count; + pstrMulticastFilterParam->cnt = u32count; s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg)); if (s32Error)