From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756766AbdEHTss (ORCPT ); Mon, 8 May 2017 15:48:48 -0400 Received: from smtprelay0126.hostedemail.com ([216.40.44.126]:43456 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754883AbdEHTsq (ORCPT ); Mon, 8 May 2017 15:48:46 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3353:3622:3865:3867:3870:3871:3872:3873:3874:4321:5007:7514:8957:9592:10004:10400:10848:11026:11232:11657:11658:11914:12043:12296:12438:12555:12740:12760:12895:13149:13161:13229:13230:13439:14096:14097:14181:14659:14721:21080:21451:21627:30054:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: time01_8683c56983839 X-Filterd-Recvd-Size: 3392 Message-ID: <1494264198.31950.59.camel@perches.com> Subject: Re: [PATCH] staging : rtl8188eu : remove unnecessary else From: Joe Perches To: Surender Polsani , gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org In-Reply-To: <1494232980-27334-1-git-send-email-surenderpolsani@gmail.com> References: <1494232980-27334-1-git-send-email-surenderpolsani@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" Date: Mon, 08 May 2017 10:23:18 -0700 Mime-Version: 1.0 X-Mailer: Evolution 3.22.6-1ubuntu1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2017-05-08 at 14:13 +0530, Surender Polsani wrote: > according to coding style else is not generally > useful after a break or return > > Signed-off-by: Surender Polsani > --- > drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c > index d04b7fb..7420f55 100644 > --- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c > +++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c > @@ -212,8 +212,7 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter) > > rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false); > return true; > - } else { > + } > dm_swat_tbl->SWAS_NoLink_State = 0; > return false; > - } > } It's just fine how else after return is used here. In the future you should reflow indentation after removing braces though. The function might be restructured a bit to return false before ever returning true. Something like: --- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c index d04b7fbb71e1..1de9bcaa58b8 100644 --- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c @@ -198,22 +198,22 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter) struct sw_ant_switch *dm_swat_tbl = &dm_odm->DM_SWAT_Table; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - /* Condition that does not need to use antenna diversity. */ + /* Condition that does not need to use antenna diversity */ if (Adapter->HalData->AntDivCfg == 0) return false; if (check_fwstate(pmlmepriv, _FW_LINKED)) return false; - if (dm_swat_tbl->SWAS_NoLink_State == 0) { - /* switch channel */ - dm_swat_tbl->SWAS_NoLink_State = 1; - dm_swat_tbl->CurAntenna = (dm_swat_tbl->CurAntenna == Antenna_A) ? Antenna_B : Antenna_A; - - rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false); - return true; - } else { + if (dm_swat_tbl->SWAS_NoLink_State != 0) { dm_swat_tbl->SWAS_NoLink_State = 0; return false; } + + /* switch channel */ + dm_swat_tbl->SWAS_NoLink_State = 1; + dm_swat_tbl->CurAntenna = dm_swat_tbl->CurAntenna == Antenna_A ? Antenna_B : Antenna_A; + rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false); + + return true; }