From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752848AbdDNMPk (ORCPT ); Fri, 14 Apr 2017 08:15:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48592 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752529AbdDNMPg (ORCPT ); Fri, 14 Apr 2017 08:15:36 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4E3ED6AADB Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=hdegoede@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4E3ED6AADB Subject: Re: [PATCH] staging: rtl8723bs: clean up identical code on an if statement To: Colin King , Greg Kroah-Hartman , Larry Finger , devel@driverdev.osuosl.org References: <20170413154636.11713-1-colin.king@canonical.com> Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org From: Hans de Goede Message-ID: <560665f3-45cb-0d34-aac1-04f3fe6d4b59@redhat.com> Date: Fri, 14 Apr 2017 14:15:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170413154636.11713-1-colin.king@canonical.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 14 Apr 2017 12:15:36 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 13-04-17 17:46, Colin King wrote: > From: Colin Ian King > > The two different paths for an if statement are identical and hence > we can just replace it with the single statement. > > Detected by CoverityScan, CID#1428443 ("Identical code for > different branches") > > Signed-off-by: Colin Ian King Patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c > index 53755e5b97a6..9e355734f0c0 100644 > --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c > +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c > @@ -1093,11 +1093,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) > rtw_init_bcmc_stainfo(adapter); > } > > - if (lock_scanned_queue) { > - find_network(adapter); > - } else { > - find_network(adapter); > - } > + find_network(adapter); > > if (lock_scanned_queue) > adapter->securitypriv.key_mask = 0; >