From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752683AbcAAXNP (ORCPT ); Fri, 1 Jan 2016 18:13:15 -0500 Received: from mail-lf0-f48.google.com ([209.85.215.48]:36116 "EHLO mail-lf0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbcAAXNL (ORCPT ); Fri, 1 Jan 2016 18:13:11 -0500 Subject: Re: [PATCH 2/3] net-iwlegacy: One check less in il_eeprom_init() after error detection To: SF Markus Elfring , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Kalle Valo , Stanislaw Gruszka References: <566ABCD9.1060404@users.sourceforge.net> <5686E13F.2010309@users.sourceforge.net> <5686E21E.4090901@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Sergei Shtylyov Message-ID: <56870803.7010807@cogentembedded.com> Date: Sat, 2 Jan 2016 02:13:07 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <5686E21E.4090901@users.sourceforge.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 1/1/2016 11:31 PM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Fri, 1 Jan 2016 21:12:29 +0100 > > This issue was detected by using the Coccinelle software. > > Adjust a jump target to avoid a check repetition before the function > call "il_eeprom_free". One question: why? > > Signed-off-by: Markus Elfring > --- > drivers/net/wireless/intel/iwlegacy/common.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c > index c3afaf7..ae45fd3 100644 > --- a/drivers/net/wireless/intel/iwlegacy/common.c > +++ b/drivers/net/wireless/intel/iwlegacy/common.c [...] > @@ -772,9 +772,11 @@ il_eeprom_init(struct il_priv *il) > done: > il->ops->eeprom_release_semaphore(il); > > -err: > - if (ret) > + if (ret) { > +free_eeprom: This is ugly, I'd say. [...] MBR, Sergei