From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756537AbdDQPYa (ORCPT ); Mon, 17 Apr 2017 11:24:30 -0400 Received: from mout.web.de ([212.227.17.11]:54819 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754332AbdDQPY2 (ORCPT ); Mon, 17 Apr 2017 11:24:28 -0400 Subject: [PATCH 14/25] net: mvpp2: Rename a jump label in two functions 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: <77376169-1cc0-c138-216e-c409948b8eb0@users.sourceforge.net> Date: Mon, 17 Apr 2017 17:24:11 +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:2Pp6qHR6w49enbJFO0OQ6y0oM4pQVHmpL+MNAkhyO3T8TUKTnZj zqT87vM4PWzA7byluUE2KMTJX8KStVnMQTrxm4YL3wj+kHiYH+7gqlJOZEkfPjt1RBhCkUj tmKkWnheui52nTadTaeteqI/jecdtLni2z3z7+jYFbTnKypSrZyEpqQH6CiacJWxM6svJrv /XI//BcWxY53B9xfdoesg== X-UI-Out-Filterresults: notjunk:1;V01:K0:8900xIG9daI=:e7UA7i4JRaCkYzdwIZBL8N wGBCJHW8IgTYZqBxzlCTgRmevWUbW+DzB/DMlvv1BwGVfGDYjpSfL9/nfYOH5KFogpfUX+5sT FvAET5s6EIbrzLOGf/ssP4npZ+rmbdwErXH7R3DKy1f0qcZh4EOVvUVQkMYRJi9bRgFplhl/+ pF4p5HGUHdmTUVvM58rXo35bIKuBWbwKRuDiH8YCgXGB9R/Jp9DKUEBpC/zXiLmeRzXs0E/uY DZrIEIsqefUlMQJUE/iVvEDl59GNHXu/E94Ud1JrezlcKtK8gQJq1aehqwQcWO63fZkKGyYqN FJk1gH6W0oLXHNDU51ZZAAW1Jj5eRFGlp58BY1km5ni+oHJjMV60wCPVVlAyg+f9A9/MlekH+ p074QVEoBHTgpCYlyuTqye8QOcsM6YX2k2k94NX8ynjC0AyI3x4ZI5HQby5a1zeDMZjobATSm NjRJDa83QiRAI3PU/E46pjx1UHNHwY5OasDiwwLzwqr9vKyWthuEUwoh6O9gg1kuf5MGJfaDk zCjKRJc4wHtVEUNVWJ7SgEcinMfPK4FHD7hUIFe4l+UQ1htu5OoqfnFN2c0/8SdTaMuWNaiRW x6yMgGm6YFkMDpyQLB5+DQ5UDPMsgcbsJQIyjtClQlA6ibUK0+RAXp4m7gVk1BCbQ8j09cQjG Vh2Tj3Wqld897QM3qptlrb/jZ1nnuab8ZrMh5adIYGeMNZx5CC8LXlIB6SYg02g5rc0HO2Jey xxIHRiNjx+S0JQzB5854tbZZ+cOkQKBMOYOcvlJz9GkMuwRH3gVoLfaX+bISdsPuUbo4p6XEZ gClhY+z 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 11:10:47 +0200 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/net/ethernet/marvell/mvpp2.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 4f4b659d7297..89237abf386d 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -6065,7 +6065,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) if (!is_valid_ether_addr(addr->sa_data)) { err = -EADDRNOTAVAIL; - goto error; + goto log_error; } if (!netif_running(dev)) { @@ -6075,7 +6075,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) /* Reconfigure parser to accept the original MAC address */ err = mvpp2_prs_update_mac_da(dev, dev->dev_addr); if (err) - goto error; + goto log_error; } mvpp2_stop_dev(port); @@ -6087,14 +6087,13 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) /* Reconfigure parser accept the original MAC address */ err = mvpp2_prs_update_mac_da(dev, dev->dev_addr); if (err) - goto error; + goto log_error; out_start: mvpp2_start_dev(port); mvpp2_egress_enable(port); mvpp2_ingress_enable(port); return 0; - -error: +log_error: netdev_err(dev, "fail to change MAC address\n"); return err; } @@ -6120,7 +6119,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) /* Reconfigure BM to the original MTU */ err = mvpp2_bm_update_mtu(dev, dev->mtu); if (err) - goto error; + goto log_error; } mvpp2_stop_dev(port); @@ -6134,7 +6133,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) /* Reconfigure BM to the original MTU */ err = mvpp2_bm_update_mtu(dev, dev->mtu); if (err) - goto error; + goto log_error; out_start: mvpp2_start_dev(port); @@ -6142,8 +6141,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) mvpp2_ingress_enable(port); return 0; - -error: +log_error: netdev_err(dev, "fail to change MTU\n"); return err; } -- 2.12.2