From patchwork Wed Oct 29 06:35:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sharma, Sanjeev" X-Patchwork-Id: 5184711 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CD79B9F318 for ; Wed, 29 Oct 2014 06:35:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7FC7201D3 for ; Wed, 29 Oct 2014 06:35:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A9BF201DD for ; Wed, 29 Oct 2014 06:35:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753533AbaJ2GfR (ORCPT ); Wed, 29 Oct 2014 02:35:17 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:49223 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751670AbaJ2GfQ convert rfc822-to-8bit (ORCPT ); Wed, 29 Oct 2014 02:35:16 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XjMqh-0001K7-7N from Sanjeev_Sharma@mentor.com ; Tue, 28 Oct 2014 23:35:15 -0700 Received: from EU-MBX-02.mgc.mentorg.com ([169.254.3.106]) by SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) with mapi id 14.03.0181.006; Wed, 29 Oct 2014 06:35:14 +0000 From: "Sharma, Sanjeev" To: Joe Perches , Jes Sorensen CC: "Larry.Finger@lwfinger.net" , "gregkh@linuxfoundation.org" , "linux-wireless@vger.kernel.org" , "devel@driverdev.osuosl.org" , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH] staging:rtl8723au: core: Fix error reported by checkpatch. Thread-Topic: [PATCH] staging:rtl8723au: core: Fix error reported by checkpatch. Thread-Index: AQHP8bvmvV8vePNHPEKsRX+GA9Vg3JxDoQwegABmxACAApleoA== Date: Wed, 29 Oct 2014 06:35:12 +0000 Message-ID: References: <1414396745-8845-1-git-send-email-sanjeev_sharma@mentor.com> <1414421554.8884.7.camel@perches.com> In-Reply-To: <1414421554.8884.7.camel@perches.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [137.202.0.76] 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=-5.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_BLACK 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 -----Original Message----- From: Joe Perches [mailto:joe@perches.com] Sent: Monday, October 27, 2014 8:23 PM To: Jes Sorensen Cc: Sharma, Sanjeev; Larry.Finger@lwfinger.net; gregkh@linuxfoundation.org; linux-wireless@vger.kernel.org; devel@driverdev.osuosl.org; linux-kernel@vger.kernel.org Subject: Re: [PATCH] staging:rtl8723au: core: Fix error reported by checkpatch. On Mon, 2014-10-27 at 09:43 +0100, Jes Sorensen wrote: > Sanjeev Sharma writes: > > This is a patch to the rtw_cmd.c file that fixes Error reported by > > checkpatch. [] > > diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c > > b/drivers/staging/rtl8723au/core/rtw_cmd.c [] > > @@ -957,7 +957,7 @@ static void traffic_status_watchdog(struct rtw_adapter *padapter) > > /* check traffic for powersaving. */ > > if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + > > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8) || > > - pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2) > > + pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) > > bEnterPS = false; > > else > > bEnterPS = true; > > This makes the line longer than 80 characters, that is worse than the > 'problem' you are fixing. The code already has dozens of long lines already. This is generally a problem because the variable names are pretty long so strict 80 column adherence generally isn't possible. A possible way to shorten these relatively long variable name/line lengths is to use a temporary for pmlmeprv->LinkDetectInfo struct rt_link_detect *ldi = &pmlmeprv->LinkDetectInfo; so: I am agree on this approach but Let's wait for Jes opinion on it. Sanjeev Sharma drivers/staging/rtl8723au/core/rtw_cmd.c | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index d2d7edf..1b24945 100644 --- a/drivers/staging/rtl8723au/core/rtw_cmd.c +++ b/drivers/staging/rtl8723au/core/rtw_cmd.c @@ -922,34 +922,33 @@ static void traffic_status_watchdog(struct rtw_adapter *padapter) u8 bHigherBusyTxTraffic = false; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; int BusyThreshold = 100; + struct rt_link_detect *ldi = &pmlmepriv->LinkDetectInfo; + /* */ /* Determine if our traffic is busy now */ /* */ if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (rtl8723a_BT_coexist(padapter)) BusyThreshold = 50; - else if (pmlmepriv->LinkDetectInfo.bBusyTraffic) + else if (ldi->bBusyTraffic) BusyThreshold = 75; /* if we raise bBusyTraffic in last watchdog, using lower threshold. */ - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { + if (ldi->NumRxOkInPeriod > BusyThreshold || + ldi->NumTxOkInPeriod > BusyThreshold) { bBusyTraffic = true; - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) + if (ldi->NumRxOkInPeriod > ldi->NumTxOkInPeriod) bRxBusyTraffic = true; else bTxBusyTraffic = true; } /* Higher Tx/Rx data. */ - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) { + if (ldi->NumRxOkInPeriod > 4000 || + ldi->NumTxOkInPeriod > 4000) { bHigherBusyTraffic = true; - - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) + if (ldi->NumRxOkInPeriod > ldi->NumTxOkInPeriod) bHigherBusyRxTraffic = true; else bHigherBusyTxTraffic = true; @@ -958,9 +957,9 @@ static void traffic_status_watchdog(struct rtw_adapter *padapter) if (!rtl8723a_BT_coexist(padapter) || !rtl8723a_BT_using_antenna_1(padapter)) { /* check traffic for powersaving. */ - if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8) || - pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2) + if (((ldi->NumRxUnicastOkInPeriod + + ldi->NumTxOkInPeriod) > 8) || + ldi->NumRxUnicastOkInPeriod > 2) bEnterPS = false; else bEnterPS = true; @@ -971,18 +970,19 @@ static void traffic_status_watchdog(struct rtw_adapter *padapter) else LPS_Leave23a(padapter); } - } else + } else { LPS_Leave23a(padapter); + } - pmlmepriv->LinkDetectInfo.NumRxOkInPeriod = 0; - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod = 0; - pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod = 0; - pmlmepriv->LinkDetectInfo.bBusyTraffic = bBusyTraffic; - pmlmepriv->LinkDetectInfo.bTxBusyTraffic = bTxBusyTraffic; - pmlmepriv->LinkDetectInfo.bRxBusyTraffic = bRxBusyTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyTraffic = bHigherBusyTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic = bHigherBusyRxTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic; + ldi->NumRxOkInPeriod = 0; + ldi->NumTxOkInPeriod = 0; + ldi->NumRxUnicastOkInPeriod = 0; + ldi->bBusyTraffic = bBusyTraffic; + ldi->bTxBusyTraffic = bTxBusyTraffic; + ldi->bRxBusyTraffic = bRxBusyTraffic; + ldi->bHigherBusyTraffic = bHigherBusyTraffic; + ldi->bHigherBusyRxTraffic = bHigherBusyRxTraffic; + ldi->bHigherBusyTxTraffic = bHigherBusyTxTraffic; } static void dynamic_chk_wk_hdl(struct rtw_adapter *padapter, u8 *pbuf, int sz)