From patchwork Sat Jan 2 20:55: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: 7940981 X-Patchwork-Delegate: kvalo@adurom.com 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 8283FBEEE5 for ; Sat, 2 Jan 2016 20:55:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF9502039E for ; Sat, 2 Jan 2016 20:55:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0F7420396 for ; Sat, 2 Jan 2016 20:55:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752077AbcABUzo (ORCPT ); Sat, 2 Jan 2016 15:55:44 -0500 Received: from mout.web.de ([212.227.17.11]:52680 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751751AbcABUzm (ORCPT ); Sat, 2 Jan 2016 15:55:42 -0500 Received: from [192.168.1.2] ([77.181.40.156]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0M3T1Y-1Zy4ss04i8-00r2t8; Sat, 02 Jan 2016 21:55:38 +0100 Subject: [PATCH 2/3] NFC-mei_phy: Refactoring for mei_nfc_if_version() To: linux-wireless@vger.kernel.org, Aloisio Almeida Jr , Lauro Ramos Venancio , Samuel Ortiz References: <566ABCD9.1060404@users.sourceforge.net> <56883849.2080304@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <56883947.7050505@users.sourceforge.net> Date: Sat, 2 Jan 2016 21:55: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: <56883849.2080304@users.sourceforge.net> X-Provags-ID: V03:K0:iMTmMpccgKVPgS2+FcrvQTyvIvD9RZ4UWXFchk3jYR26HCVNWcO zZSr/vSnLtD7yRS+ttEoTtn+O3mjRdOrV2hm+K3aJZcGHcJ5ayzYOfXVUkfuWY58bxg4WzS znkUgYB/IYDGbJrojpMVyfhCrBhDFJ1k9sLwfFD2Y7HecYLEUARL2BF5AVdo6YpTFgMw+SO GKBahrN4SDc+Za5gMxNLg== X-UI-Out-Filterresults: notjunk:1; V01:K0:OcnP6KcCYzc=:W14BWzuddXKIY3EqQD7z4h PZGRglNcGW+DnSsItirqSeRgosYI9Owmp1lUinL6jKNTSVUhD+22g6nHjSp62cxT7Z20fAuop 8Tj13M+92WHF0UjOYY/rHCQ1yZWSwfrBRg/SLaMlFD06FqjwmFLZLs7xTrZDsh7fwyHDfMa8H TIA1+yFaKGN48K3bP7yFolWfCZWNg3QC6TPCwT4vczZHTFJzixLXqo+PHLcVRgTNLbDVmHwFl WT26lWolNVdRa3k+6vdxMv348cqSpxNAtzTibfYvJcg65/HQHzKSAJhp5TRuL9fvVAD2M/14z tbF9F2WzOXM2+KJn9B4HD9q4eaODKLoSPsO1sx7+CFkVYjgIXI+a4Un5pvZWVkKDUZ9xW01aj i3/6TGr8DkjuQb9JVm2peRkqHyAZkmykCADON7mlfdqu9dU2/0KCxKdYbFxWtgjOq9+Dh9Utl 4hOct32GhvlAGngeW9PSz+pD2Nje/vToPueYbL12+AR7yyhEIFSeKuRzgwgO1kZrKgeHXuKS8 Wrxqp0p6I3tfaIJyv6aOvm2egPTk7aUbvE6CbJgydyu+E6nDMU+94xyYhqh8A684sRYIPnvUu 2rcvVByLMIxkBu9CHAAWi+JmzsLy3MruSzVD76pX/38yhrx4aqUO/UPTNrsqkd6DzGLf1Q4Jx 5EF4eUXww/Mbvzsav8934UBFz/zpZjAAI+9safar+4oXeZnhyuFotXrtlwhky0rCSOUOHwNVL TykJmCsv9n1ZbJ+wPGFwmEfr20DqrcNhRQpZFWeNgmjbNs6ohsbLnVt/AxVNmLzLDG7n58L7P 1IMYNXw 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: Sat, 2 Jan 2016 21:33:04 +0100 Rename a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/nfc/mei_phy.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c index 8e3a69f..3c74028 100644 --- a/drivers/nfc/mei_phy.c +++ b/drivers/nfc/mei_phy.c @@ -136,7 +136,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) { pr_err("Could not read IF version\n"); r = -EIO; - goto err; + goto free_reply; } version = (struct mei_nfc_if_version *)reply->data; @@ -144,8 +144,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) phy->fw_ivn = version->fw_ivn; phy->vendor_id = version->vendor_id; phy->radio_type = version->radio_type; - -err: +free_reply: kfree(reply); return r; }