From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756675AbdDQP3Y (ORCPT ); Mon, 17 Apr 2017 11:29:24 -0400 Received: from mout.web.de ([217.72.192.78]:65232 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754621AbdDQP3W (ORCPT ); Mon, 17 Apr 2017 11:29:22 -0400 Subject: [PATCH 19/25] net: mvpp2: Rename a jump label in mvpp2_prs_vlan_add() From: SF Markus Elfring To: netdev@vger.kernel.org, "David S. Miller" , Florian Fainelli , Jarod Wilson , Jisheng Zhang , Mirko Lindner , Philippe Reynes , Russell King , Sergei Shtylyov , Stephen Hemminger , Thomas Petazzoni Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <949a3bd7-7b65-8a9e-c535-6fafeb06f1a2@users.sourceforge.net> Date: Mon, 17 Apr 2017 17:29:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:uywBU/HzP9pZOot76QPj1B+ctSN75ZDfVNnOCwgd9x1FP9U1K6l wWQgNhVMptPdnBBYS90G6C2IrTQLHTIxxQENNZskg1ImWvJUFZ6GzWrpaB55g91vPwWz4SH H8WfJ1JS4msgB17Yw/UcJOEUoEMp9zoSjroWjGJ56eCRCAiCTz/uFGtbTgyTYNM5Ip8OYRa bawaCuhlexGXCPWaZYL3Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:GR3nzfBVI1w=:Q9vbiyqYVXxQMUvNmkbTsa LekTU2UhGWnotQtRj5nnUumO3MjOKVEQrkojM+2kJGcCc7kk5A/MsrfsWVAQP9vCASSyzQDXG agbXVznDi2dBv1fgUf7f90GwMGTR4gfhy1DSbj0C80od0Yee1VpffJRdMZZfBrnU2iiXzs4pV kk/JfuGIZay1WWTRRYrB7yZD16yraDOxMqcU43fTQbMCCdL5SdtgV13IdSP4TkHJdF68yogjJ FUL2eH0P6Ha2nbEHuTZ3eU4zo1XhIJHOTNLD/6OCCQeAtNMAFRQtC2baRJC7c4UhFQ/Ag7u5g Utg2Ez2rHBO8WVnnLGGC+pXlGgtj9eofQEGGLUKcXLZt076792E+EIZkt10zUscU/K5UVxDgY iPANsmMOEpYf5ljoJMJnG78DEiOAwiJuehq75q8d9nLS73jZnmY6y8j/LGLwsXsXE5nWMz07w sN0mvJaS6oiM59OIajQpm+vHzzwPCszUNF0bdWTaOsIQ4S12PhwCPUgEPRIloVw6OTaas1F3m 6aXP7PIDIX0AyBo/5z8RZ6InTqEv4hzShH7lM2o9rWlAluswZU7MsIJwoLaRRq7Kaeo6S2lci sCF8PWYIwyRwxnz9UHtFNK/K/EEqJcJz31bGJWltgNuEkKJYBgmUraFH1dQoY3wauWJ2FyfJy i2HjWx363t8dz7gDBmJFUnd1PsW4/UWTnTOI372qnBcClo6R3vwnNQcQHSXuq2n/vH/qxfV1a 8wh45S+T0wwYQwYIZvCrgE9kE+BV2J9gRmfUQ6buZ6AXkzq7yD2HvMI323rsBxHpY57NtZjaz 9UA7iCv Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 17 Apr 2017 13:50:35 +0200 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/net/ethernet/marvell/mvpp2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 0c190bd003b1..3bdd3f1fe34e 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -2021,7 +2021,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai, if (tid <= tid_aux) { ret = -EINVAL; - goto error; + goto free_pe; } memset(pe, 0, sizeof(*pe)); @@ -2053,8 +2053,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai, mvpp2_prs_tcam_port_map_set(pe, port_map); mvpp2_prs_hw_write(priv, pe); - -error: +free_pe: kfree(pe); return ret; -- 2.12.2