Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp131583pxb; Tue, 12 Apr 2022 19:05:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxac8bAnx887sMt+U7gb2YbASwPLP4dFerJGgHTYL/yPwH2NsawQKpksBNt36NfXpJOUOZ6 X-Received: by 2002:a17:906:af96:b0:6e8:7765:a6d4 with SMTP id mj22-20020a170906af9600b006e87765a6d4mr15322645ejb.756.1649815515357; Tue, 12 Apr 2022 19:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649815515; cv=none; d=google.com; s=arc-20160816; b=lLlu8PtoYv/clA9KATmYXC+BV4R6X7OOH5TYFlb3AxLcQUC1D5IIWwI6nm8VWDR7gg vIMeUMu314dVFVrZG5xlTJw3tEPJiTLbH100AvwQ3PAtudxNhDxOR+O38vFb6h8BBq+j K6Nt25/EKWOpWl81KSXDCH+W6IyaF5P3QLxFu9NA8simqd7x2+TPRHocrNVWNMLheycT jGL2EBIN29r22vfHpuxP3R/E6rA4gFpMda4BpzfjXW3WazOICUfHI+maCH0BueDTnPCS b4eU7r3W/ZbTtwSR1byx+CHYVbGodLA+bCtOTTUt8P4pbEjNt+LU+W42o8iXVpL2B7WV KmzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=RFa/lu9Evgsu4wYDTe4ED0BwNT5fT7OcJ8ePnCMFaTE=; b=uh90xnlevp3b0MM/waM863R0KdnCIZ1JxuXoOVCcLXr5GN5pUYAnQmxScHAFtXz+DO FcBvkC+t+NDIq9IzVpZb6AOXM1P7Yi7QjblCGwvGUWWy2UlHtaVTAMA2nBuO27Kj4thx obRArkkhEEz5TZVqMiZAk1wLp2sFyrDD0/woqNchOW9MB3XCHoEln306BcLY136Y49Sg TYJF4Cw2FjFlSQDg2Cj/2oJ6flEDyhS79ECQBWluxzlxpKFRIHdJ9mIIomgwHBGJiDsB KaZLMuPdLondYpo3xfiTa5folh2HO4vyUqhsqssgFhvqwj321Xx5/LnvqkzdRGPPoHIG ucZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZYcVkWuZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dn8-20020a17090794c800b006dfe6119763si1716446ejc.325.2022.04.12.19.04.49; Tue, 12 Apr 2022 19:05:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZYcVkWuZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231420AbiDLXr4 (ORCPT + 99 others); Tue, 12 Apr 2022 19:47:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231425AbiDLXrj (ORCPT ); Tue, 12 Apr 2022 19:47:39 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34DDB8B6D5 for ; Tue, 12 Apr 2022 16:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649806586; x=1681342586; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=mjhF2LEHO+cHqCM8/1aoy6xD1SETj0bTEeakqPsejYM=; b=ZYcVkWuZmlhrlncQeXsZm7DdEUaPr1ClGpma/bwPdZKOIQZnL5C4eJJn 2GbQQBeXUQoHXWhtMoGUGys5wDS3AFAouGEtKkZqv6VNbHZMv3Ei2C3uX mYL/5besgCVb1tU7bhRQ6aVc97vyn6dfWu2XgefJWnzO/027gdnkxM8vR gMUrGANnxq1sGNeUvRCFKVDMxF+U8/zQraUuzew/Gi1lAFQeGdbVs7uXV gJZKFfeh+59EljPdTUxKG64mGzmZRSpEszdt2QECsR8SOmVCbp6eVeAAG h86wKBN8CJC/ldwWz/YwltQ1DQoivp4p6pJJ3SjTS5iY2nkLZlYZLCkVG Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10315"; a="322975986" X-IronPort-AV: E=Sophos;i="5.90,254,1643702400"; d="scan'208";a="322975986" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2022 16:36:25 -0700 X-IronPort-AV: E=Sophos;i="5.90,254,1643702400"; d="scan'208";a="660707822" Received: from aalaniz-mobl.amr.corp.intel.com (HELO localhost) ([10.209.160.104]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2022 16:36:25 -0700 Date: Tue, 12 Apr 2022 16:36:24 -0700 From: Ira Weiny To: Rebecca Mckeever Cc: outreachy@lists.linux.dev, Larry Finger , Phillip Potter , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter Subject: Re: [PATCH 2/3] staging: r8188eu: combine both sides of conditional statement Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Apr 03, 2022 at 02:17:05PM -0500, Rebecca Mckeever wrote: > Both sides of conditional statement are the same except for the comment. > Additional instance found with git grep. > > Suggested-by: Dan Carpenter > Signed-off-by: Rebecca Mckeever Reviewed-by: Ira Weiny > --- > drivers/staging/r8188eu/core/rtw_cmd.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c > index da455eb4d8cb..2d316a6c8294 100644 > --- a/drivers/staging/r8188eu/core/rtw_cmd.c > +++ b/drivers/staging/r8188eu/core/rtw_cmd.c > @@ -1411,11 +1411,9 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) > { > struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > > - if (pcmd->res == H2C_DROPPED) { > + if (pcmd->res != H2C_SUCCESS) { > /* TODO: cancel timer and do timeout handler directly... */ > _set_timer(&pmlmepriv->scan_to_timer, 1); > - } else if (pcmd->res != H2C_SUCCESS) { > - _set_timer(&pmlmepriv->scan_to_timer, 1); > } > > /* free cmd */ > @@ -1445,11 +1443,9 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) > { > struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > > - if (pcmd->res == H2C_DROPPED) { > + if (pcmd->res != H2C_SUCCESS) { > /* TODO: cancel timer and do timeout handler directly... */ > _set_timer(&pmlmepriv->assoc_timer, 1); > - } else if (pcmd->res != H2C_SUCCESS) { > - _set_timer(&pmlmepriv->assoc_timer, 1); > } > > rtw_free_cmd_obj(pcmd); > -- > 2.32.0 >