From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756628AbdDQP22 (ORCPT ); Mon, 17 Apr 2017 11:28:28 -0400 Received: from mout.web.de ([212.227.17.11]:56524 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754621AbdDQP2Z (ORCPT ); Mon, 17 Apr 2017 11:28:25 -0400 Subject: [PATCH 18/25] net: mvpp2: Rename a jump label in mvpp2_prs_double_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: <489b0f89-c362-e931-0b5a-baa0df84b275@users.sourceforge.net> Date: Mon, 17 Apr 2017 17:28:10 +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:bYZ6ES+5j3bix3vgA62VOKzo/08oMmKnsZZ4yYfkx0L5ZB4LxRy 482d31kow7GO8wZBRfMvZkyttilEegZvfT2r5GPWTRe1h5+OjImQV2coyzKtQ7XX+j9zYwI s6WywX5R9s9SCygK4Zr9HGh6JOdL5c50rB6HIGQBH/pfJApIrz4LAYVYpMc+tidiNAcBeX3 fI7giJevBHFJiM2IEI4bQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:51SNkmnYTS4=:XdKpHCSsGNNo95Hz8PuteC +EXR5uQe5e5sL6o+G5PIZ8wy1zmr53w3MD1/lFim3nTE7Zfqt59HZoHiCbP9y003abp4v6RzE 4gTC5T+IEiwAELN03EX4v/h4s7Yx+ShtaBHFfPdBfcZtbFMRqHrV7DqgPG2Eba7l3D01vYv8A JI1EPlcws4vWwpseIA5b/HSEThXwDbPQgS9TLBNLEAGbGQQkvFRk3yHPg2K/yDRdptFbTGQ9z i7Z1wPVpcK0j1d99COpk/8b2grWF1+l1H0h7gEdAfFRiF71iYszvdzux3zHKBwQZOUylk0lgi rf0wopMDdrgx+PjCdJm00Qsa9AoRlk5/sYEznEaZ2VCN8Iu+J16Vwu38hK5Fdj+jbYvgfnr84 GH5fuz7jRFJj+axEy0nVZEsISNu1OP7VXambwL5s4V03jzlREEgIghg2+26FsN2eqT2FFJa/V MlRRr6BHTmb26CycIqxC7ZYpPFGIDa+FKPbJxn+XrJ3PLmYYDoVND3YT8gPWBaa7VtIrYTBEi JekHDJGamJvnZyRxBTOOjYzqPovZYbgxfug7vJ9w1F4OD7mh70wR62KlPJySMtgcAVKBuI1UM oSstbNtI3PKvd6Iu57ULEZQnRah/gFbUxy4aBv55g7lCPV4P8gv9oJySCXPiThQhN8tIho6+U QI0jl0a8ORHdn2+HMw+yRkChg64ze+YehYewxIN418cxnpuQzz6qOcUr9+ROybGzfUbRbt6R/ JeM5nOBhKIBG8b8BzysV3XBa7L1Y56ZIVSmYhlgwzVe9GKl2GfAFDPiDo94vaS2BGkfIf5LuE 8SVdlMf 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:03:49 +0200 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/net/ethernet/marvell/mvpp2.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index a5cd1036012a..0c190bd003b1 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -2139,7 +2139,7 @@ static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1, ai = mvpp2_prs_double_vlan_ai_free_get(priv); if (ai < 0) { ret = ai; - goto error; + goto free_pe; } /* Get first single/triple vlan tid */ @@ -2162,7 +2162,7 @@ static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1, if (tid >= tid_aux) { ret = -ERANGE; - goto error; + goto free_pe; } memset(pe, 0, sizeof(*pe)); @@ -2189,8 +2189,7 @@ static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1, /* Update ports' mask */ 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