From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763116AbcINOHa (ORCPT ); Wed, 14 Sep 2016 10:07:30 -0400 Received: from mout.web.de ([212.227.17.11]:63667 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751061AbcINOHZ (ORCPT ); Wed, 14 Sep 2016 10:07:25 -0400 Subject: [PATCH 08/11] virtio_console: Rename jump labels in port_fops_write() To: virtualization@lists.linux-foundation.org, Amit Shah , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , Rusty Russell References: <566ABCD9.1060404@users.sourceforge.net> <020438b9-a7f8-0050-04c1-43382ba60b75@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Wed, 14 Sep 2016 16:07:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <020438b9-a7f8-0050-04c1-43382ba60b75@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ZDOYGkZX5IObGELO9MLOo7KKoKZCJL/3fDLooS4HMwq1MZr5J1U oukTIdW0+6/MyWVQ1Cwaa7JydAnKj3muHbUcHYN5dOEfS6YsRD9LEOMtm6LkJWMdw2KOJ9g mlk/8YhMbWCAyhV3zwLAQspgMvZbQQe3/DuCR9gJyQPOmCQXPuc4LDw8R2TNIKB5JR9rwRi SqwHwrr5Ic/aIS/wwXQ4g== X-UI-Out-Filterresults: notjunk:1;V01:K0:kUjbpMbFVU8=:p+iZ+3/nWZz/1qO4qub7ra xFxYUCENQ1WisE3+zH+LEVA3kOOwNJoYsg7p8oJ2EwZa+JXtyDVuAdZK7D6JdSb98rkTikB8u yxnF2nnHWmvyFJmNj+n2uGP8Halj2nUqu17Iw/JP81mKnger7OaRCTCYBS1Movkj6JKB4KYPs jDfRUsPPDd+/HqaEnPGd6c/PiMjPb6ahHwS+sAm1qqgRMcwKpsNd7/Gj1MVR8uJ86CaXYr5GL BpW2pl+5ZcqzeQ1aYDQAVJoaruMQdxiu9AmbwDSYn0xWIHLKSSK2hkYnpYBe0fv/HrMkwWrbE k7sjYd8NjRRQSUUX5zDUqTAkMMvyZJY+jLWDw95VskzeO8Nc4bWgsjQuL4nPXKW6sZ0c4qrtK LM0reBFR1jvbKs/25uZdJIgoZRRvRQAfEPsoSqRpNyb7T1+DorKF/Xc2KpAkLL1ZG+GJwdSkG 1vklUg8v7ARQepWnbQKxEPCWgbYyuzRmxV22PuH4mN80MG6yoKhmyUGnSkF5ez4hm3zgsPOGU XKK+HVkVDMqoloJPkGgk9GjzlLwDZD0ApuWwW6usZX6+HkbYNIvtL6sK3+ciZY7vdpAQXT3UT Yh5TP5QTjSBZAuXHciaZi4oksPW0aHgMALvCN0/VVH3DpzN+E7xNpJ9lEBF893Qj0V5HcdQwx PtlruiSDGMELyA7t4rlRBOZQzceVeFX2AB7aiuEzIdR1M6U5v+fYkbLmEtnOTDRpKT9YkolqS JlvWEBkbfe6MEgrMbJvszqWC9l4pJA9URdRvZ/W4ZC1BaNa9B5WuIjZ2F20oG5FthqckIAZTk coIJcxF Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 14 Sep 2016 15:07:42 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/char/virtio_console.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index d8681d9..babc812 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -842,7 +842,7 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, ret = copy_from_user(buf->buf, ubuf, count); if (ret) { ret = -EFAULT; - goto free_buf; + goto free_buffer; } /* @@ -857,11 +857,10 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, ret = __send_to_port(port, sg, 1, count, buf, nonblock); if (nonblock && ret > 0) - goto out; - -free_buf: + goto exit; + free_buffer: free_buf(buf, true); -out: + exit: return ret; } -- 2.10.0