From patchwork Fri Jan 1 20:32:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 7940021 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8EFBB9F387 for ; Fri, 1 Jan 2016 20:32:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B693520501 for ; Fri, 1 Jan 2016 20:32:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE748204FF for ; Fri, 1 Jan 2016 20:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752561AbcAAUcp (ORCPT ); Fri, 1 Jan 2016 15:32:45 -0500 Received: from mout.web.de ([212.227.17.12]:50802 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273AbcAAUcn (ORCPT ); Fri, 1 Jan 2016 15:32:43 -0500 Received: from [192.168.1.2] ([77.182.63.9]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0MgfJz-1aZg272Uf1-00O1y3; Fri, 01 Jan 2016 21:32:36 +0100 Subject: [PATCH 3/3] net-iwlegacy: Another refactoring for il_eeprom_init() To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Kalle Valo , Stanislaw Gruszka References: <566ABCD9.1060404@users.sourceforge.net> <5686E13F.2010309@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5686E263.1020901@users.sourceforge.net> Date: Fri, 1 Jan 2016 21:32:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <5686E13F.2010309@users.sourceforge.net> X-Provags-ID: V03:K0:fRDVshue934fRKtOPAj5F0d6poYrIPd8AUqE/mETspolgOm4Kd+ emzGPHsNFgQIwH3RRx8x0+TKt1apa3xEctulYZPagG+6WTaWoZemjV+q5edBNCV/x1g9HSU COoZuNxBCf1Ku54o6fT21OpMLALMjKcDWNPci4K0dCstYMMA7lSpcr9L5fAvQqD8id3ZXPj jAH1Gm4sYYdac384yz0DQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:6Vfh8CY2UzI=:9xyUmtAa3f9mf38ILsl1m2 eEyLCUThIwbYmCRXeK+uIzqhpJLzeTBOWf4GIbGHlgFLziH7gbtztPw2l2gesT4fJG24n562X RDN0dGVP/VtBEJ9krXWeeaC2IdUV6SyYdLGFzVthgLFwBSAjx9EJK7Ht7BiqBe3BD+HwVE7mZ DkjAy+W00y8VdYH5XA91xMWiLj7fxlMTCExy3Ak/Ghe3op1O0tFdtK4i8TiCVrg3OrQXCVAKr HtkkDKhmwKjzhXFnZhBDt6RlKotvQWYTjqrkFnDnfiAzwrLqezvKVJD4g1e4BP/6JwO97kmrk Oi6OouG64Jm2EUJof9miKMyrD/4ErUwxpvnOWtHLH5TDddsdu38HizikUET8ectbugVlQy8W0 2p4GPOL8f/O0HI0Ga2COuQfpnnWCHUKzN1ldRTE9dRi+ipLiEFm5LGIPdin1aVEtCpoMQ0vBI gXnp3K6FsKhEplz0ESr+4He3YnIzZPkstbrHRFVAFXOvpr7BtR6wi6vC4iJupUjyMX7LAHxdv VE9rcXFJsdh5vgdHKBE8KFxl0kJEJrLJONDcHIXMWCncn/9H3mabF1M7zYfCwcQ8gFDyEtPUs e+DSVyci5XJGgOxpSArieWVUkQId5MeJBIxJzO5KlvS8LS2Wlc4GSsIM5k6wUgtUa70t9oN3t vo6HF04u+2GL/EbhqKc+khyiAT98LnnI4EmedFQ7DykCh/IUQOOyp0UzJKb/9X1xnEMj9FD1P Znc8wrYq6Sh6Yepwuh66aNfy1216/BTYOjdogE0J5ATgM0u2ZLGCRweYLO7+z/mLtbb1+cMDp CxDKNtX Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: Markus Elfring Date: Fri, 1 Jan 2016 21:16:01 +0100 Rename a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/net/wireless/intel/iwlegacy/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c index ae45fd3..660ab2b 100644 --- a/drivers/net/wireless/intel/iwlegacy/common.c +++ b/drivers/net/wireless/intel/iwlegacy/common.c @@ -759,7 +759,7 @@ il_eeprom_init(struct il_priv *il) IL_EEPROM_ACCESS_TIMEOUT); if (ret < 0) { IL_ERR("Time out reading EEPROM[%d]\n", addr); - goto done; + goto release_semaphore; } r = _il_rd(il, CSR_EEPROM_REG); e[addr / 2] = cpu_to_le16(r >> 16); @@ -769,7 +769,7 @@ il_eeprom_init(struct il_priv *il) il_eeprom_query16(il, EEPROM_VERSION)); ret = 0; -done: +release_semaphore: il->ops->eeprom_release_semaphore(il); if (ret) {