From patchwork Fri Mar 18 02:29:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 8615921 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DC35AC0553 for ; Fri, 18 Mar 2016 02:29:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 11FB92034F for ; Fri, 18 Mar 2016 02:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E61820328 for ; Fri, 18 Mar 2016 02:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752760AbcCRC3s (ORCPT ); Thu, 17 Mar 2016 22:29:48 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:35300 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752708AbcCRC3q (ORCPT ); Thu, 17 Mar 2016 22:29:46 -0400 Received: by mail-pf0-f174.google.com with SMTP id n5so146128247pfn.2 for ; Thu, 17 Mar 2016 19:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bbQCOzPfyZFvIREiGLUyPWS88pwC8emogEF8eJ5f7iw=; b=WdkblAqoQoLFYJ+nQKRXWz9yQAWsdNoVCBtUis467h7pBLle0RAIAYYxccPMMaynNR 3QCcLHCIdTDaaB6DQAnolEYE98sfARcLFIvV+sluKWb/uzEoEbbj6VR0DBLPGYAFWjVP 6I5jkKhs5TkHwwVb6iiQBhXfTKmf7frCBpfhrf9Lwz2BmRC2+q7lRaQV8LEJGtEKt8sV X3EO2JfYm3wCLXFWZSJ7KafOeVk+cKybLi9i2loyGQa4IrvNlbpkzMTzLkMs5HZGr5su fYFXcWLlgjjhj+t4WibSkFv+BjfFV6gQmKxeJOf7k0+irEaIpp/UEhdBVgcGIO+E84v8 uGIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bbQCOzPfyZFvIREiGLUyPWS88pwC8emogEF8eJ5f7iw=; b=YWD5PflknAyfTRtb4mNtMKU1KH1L4wXo+AsvxmYYX3z4f1UjP2ckPbHmCvwmk4vSoK GMCXWkr2WiORVak28XC+4naD89ITxvlsWHJ7274t8sAkI4Y/gvZkdc804DNkl23BUMV8 nAuvezz6z+MNXUwucvbPXHFZ93JP5dCLp5LzCM/v7WYFqJX5KxWaz9p5mxiTDK9tMEC+ JwHuULSKJTQVCs74W/j5vVUTqdhoL2XQveXMacP1QMAgW+FsZe2M8ZU7FhLhZI0yizBx hwMivI8L6TVwRtbET9En9ijbof5av2ljEkPtFcpSICD0aG3HuFssGVyeMrlBLB+q21ZE gofQ== X-Gm-Message-State: AD7BkJLjKojzDHdEv01ktZuPdF4VWPDWGvcVRIh+ifGZ3ENkdoV1I3HEBUnIUzwcAwkLFg== X-Received: by 10.66.140.14 with SMTP id rc14mr19895919pab.65.1458268186167; Thu, 17 Mar 2016 19:29:46 -0700 (PDT) Received: from multimedia.lan (C-59-101-14-180.hay.connect.net.au. [59.101.14.180]) by smtp.gmail.com with ESMTPSA id g70sm16409185pfj.13.2016.03.17.19.29.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 19:29:45 -0700 (PDT) From: Julian Calaby To: Kalle Valo Cc: Stanislaw Gruszka , Markus Elfring , Nicolas Pitre , Dan Carpenter , Jia-Ju Bai , Arnd Bergmann , linux-wireless@vger.kernel.org Subject: [PATCH CONTROVERSIAL 19/19] iwlegacy: Rename label in il_eeprom_init() Date: Fri, 18 Mar 2016 13:29:39 +1100 Message-Id: <90fe6325e407d35a18fa8c8cb7eaa269968d6426.1458262312.git.julian.calaby@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Rename a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring [Rewrote commit title] Signed-off-by: Julian Calaby --- This was controversial when introduced, however the change is obvious and harmless and is, in the worst case, just churn. I'm only including this as it meets my criteria for sheparding pending patches: it's sane, obviously correct or reviewable by me, and doesn't require any work to apply. This does meet those requirements, however given how controviersial it was when introduced, I'm not expecting people to be enthusiastic about applying it. Thanks, Julian Calaby --- 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 2cc3d42..a1b1360 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); err: