From patchwork Mon Jun 8 20:54:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kholmanskikh X-Patchwork-Id: 6567971 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 8198AC0020 for ; Mon, 8 Jun 2015 20:54:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 744B12041B for ; Mon, 8 Jun 2015 20:54:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 403952041A for ; Mon, 8 Jun 2015 20:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753386AbbFHUym (ORCPT ); Mon, 8 Jun 2015 16:54:42 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:36745 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752214AbbFHUyl (ORCPT ); Mon, 8 Jun 2015 16:54:41 -0400 Received: by laar3 with SMTP id r3so56662593laa.3; Mon, 08 Jun 2015 13:54:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=yn6rWT4aU5EheWIDQIIn85eu9zIWpK35DlTpmBN5Cpw=; b=I/zS2uJVlMKV6IVgFWVsZcszKXv4TAeiex4BCozm5wx7eMN0o1gJiW8rxt4PCVyzNk DRWf/fWpyBKeteotOBhYlB1H1VLrVCvBaob8AhlyrRn5Vw7HrInNiY5/rjbO+1VbgOhI Qdc/ZnQfHmDuOLSM0rIH97LEpBgVpZvQtMHvmFKWrlJ6XHrfrJ+ssxHp/nnEQDm1ZOTe PsqNBZ594L0zcqGj5YleCYd5eIXmq8DjCsF+AZ/e9pJ4BLu1TF2Cq7bvnLGFQdswOYxk plkP4oz8VPsURFJ/Y6SnfZNxhiFhe/b5l+AQmz146mUn9zu3N63CvQ+9y1Jje7gBLiT8 Mr4w== X-Received: by 10.152.18.163 with SMTP id x3mr19051948lad.70.1433796879286; Mon, 08 Jun 2015 13:54:39 -0700 (PDT) Received: from localhost.localdomain ([93.92.200.170]) by mx.google.com with ESMTPSA id p9sm888892laf.11.2015.06.08.13.54.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jun 2015 13:54:38 -0700 (PDT) From: Stanislav Kholmanskikh To: johnny.kim@atmel.com, rachel.kim@atmel.com, dean.lee@atmel.com, chris.park@atmel.com, gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Stanislav Kholmanskikh Subject: [PATCH v4 1/2] staging: wilc1000: Cleanup to coreconfigurator Date: Mon, 8 Jun 2015 23:54:28 +0300 Message-Id: <1433796869-2737-1-git-send-email-kholmanskikh.s.s@gmail.com> X-Mailer: git-send-email 1.9.1 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Fixed the following issues found with checkpatch.pl: * Multiple debug strings contained " \n". Changed it to "\n". * Changed 'return(X)' to 'return X'. * Aligned TAG_PARAM_OFFSET to fit 80 columns Signed-off-by: Stanislav Kholmanskikh --- Changes since v3: * Put a more detailed explanation what I do in patch 1/2. drivers/staging/wilc1000/coreconfigurator.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index e3e3f20..43864dc 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -28,7 +28,7 @@ #define INVALID 255 #define MAC_ADDR_LEN 6 #define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \ - BEACON_INTERVAL_LEN + CAP_INFO_LEN) + BEACON_INTERVAL_LEN + CAP_INFO_LEN) /*****************************************************************************/ /* Function Macros */ @@ -672,14 +672,14 @@ INLINE WILC_Uint16 get_asoc_id(u8 *data) WILC_Sint32 CoreConfiguratorInit(void) { WILC_Sint32 s32Error = WILC_SUCCESS; - PRINT_D(CORECONFIG_DBG, "CoreConfiguratorInit() \n"); + PRINT_D(CORECONFIG_DBG, "CoreConfiguratorInit()\n"); sema_init(&SemHandleSendPkt, 1); sema_init(&SemHandlePktResp, 0); gps8ConfigPacket = (WILC_Sint8 *)WILC_MALLOC(MAX_PACKET_BUFF_SIZE); if (gps8ConfigPacket == NULL) { - PRINT_ER("failed in gps8ConfigPacket allocation \n"); + PRINT_ER("failed in gps8ConfigPacket allocation\n"); s32Error = WILC_NO_MEM; goto _fail_; } @@ -710,13 +710,13 @@ u8 *get_tim_elm(u8 *pu8msa, WILC_Uint16 u16RxLen, WILC_Uint16 u16TagParamOffset) /* Search for the TIM Element Field and return if the element is found */ while (u16index < (u16RxLen - FCS_LEN)) { if (pu8msa[u16index] == ITIM) { - return(&pu8msa[u16index]); + return &pu8msa[u16index]; } else { u16index += (IE_HDR_LEN + pu8msa[u16index + 1]); } } - return(0); + return 0; } /* This function gets the current channel information from @@ -728,7 +728,7 @@ u8 get_current_channel_802_11n(u8 *pu8msa, WILC_Uint16 u16RxLen) index = TAG_PARAM_OFFSET; while (index < (u16RxLen - FCS_LEN)) { if (pu8msa[index] == IDSPARMS) - return (pu8msa[index + 2]); + return pu8msa[index + 2]; else /* Increment index by length information and header */ index += pu8msa[index + 1] + IE_HDR_LEN; @@ -750,7 +750,7 @@ u8 get_current_channel(u8 *pu8msa, WILC_Uint16 u16RxLen) #else /* FIVE_GHZ_BAND */ /* Extract current channel information from */ /* the beacon/probe response frame */ - return (get_current_channel_802_11n(pu8msa, u16RxLen)); + return get_current_channel_802_11n(pu8msa, u16RxLen); #endif /* FIVE_GHZ_BAND */ #else return 0; @@ -1444,7 +1444,7 @@ void ProcessAdrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessBinWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, tstrWID *pstrWID, u8 *pu8val, WILC_Sint32 s32ValueSize) { - /* WILC_ERROR("processing Binary WIDs is not supported \n"); */ + /* WILC_ERROR("processing Binary WIDs is not supported\n"); */ WILC_Uint16 u16MsgLen = 0; WILC_Uint16 idx = 0; @@ -1583,7 +1583,7 @@ WILC_Sint32 further_process_response(u8 *resp, WILC_memcpy(pstrWIDresult->ps8WidVal, cfg_str, cfg_len); /* mostafa: no need currently for the extra NULL byte */ pstrWIDresult->s32ValueSize = cfg_len; } else { - PRINT_ER("allocated WID buffer length is smaller than the received WID Length \n"); + PRINT_ER("allocated WID buffer length is smaller than the received WID Length\n"); retval = -2; } @@ -2027,7 +2027,7 @@ WILC_Sint32 ConfigProvideResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32RespLe } else { WILC_memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, gstrConfigPktInfo.s32MaxRespBuffLen); gstrConfigPktInfo.s32BytesRead = gstrConfigPktInfo.s32MaxRespBuffLen; - PRINT_ER("BusProvideResponse() Response greater than the prepared Buffer Size \n"); + PRINT_ER("BusProvideResponse() Response greater than the prepared Buffer Size\n"); } up(&SemHandlePktResp); @@ -2076,7 +2076,7 @@ WILC_Sint32 ConfigPktReceived(u8 *pu8RxPacket, WILC_Sint32 s32RxPacketLen) break; default: - PRINT_ER("ConfigPktReceived(): invalid received msg type at the Core Configurator \n"); + PRINT_ER("ConfigPktReceived(): invalid received msg type at the Core Configurator\n"); break; } @@ -2097,7 +2097,7 @@ WILC_Sint32 CoreConfiguratorDeInit(void) { WILC_Sint32 s32Error = WILC_SUCCESS; - PRINT_D(CORECONFIG_DBG, "CoreConfiguratorDeInit() \n"); + PRINT_D(CORECONFIG_DBG, "CoreConfiguratorDeInit()\n"); if (gps8ConfigPacket != NULL) {