From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762599AbcINOJ3 (ORCPT ); Wed, 14 Sep 2016 10:09:29 -0400 Received: from mout.web.de ([217.72.192.78]:49814 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756879AbcINOJ1 (ORCPT ); Wed, 14 Sep 2016 10:09:27 -0400 Subject: [PATCH 10/11] virtio_console: Rename jump labels in alloc_buf() 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: <7529185b-100b-6724-f4a9-eb3b4d290ed7@users.sourceforge.net> Date: Wed, 14 Sep 2016 16:09:03 +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:E9JNHYZteGfbs6dTOCqEwgySHJP4Wf1E5UJAY/Yz2DdudIvg2ur hP5Iz/1R9WC6bkbZ1YyycBoNp1lODRngjbCe/sH7hhRm2YueuH7c0sRXUIh76LFvw9TmmXD RdqdVbFjwkSIK25DO2fQUquoX/gqosS68tZJ5hhVzihbcVHbpe5LsWjwsBnIOdfSetUTZkg T16tsr8feowA3qVIwlHvg== X-UI-Out-Filterresults: notjunk:1;V01:K0:LzpiMb6D1ow=:iqz6TC8M4OT9Am5dKZFuYj L8Z52kWJJ/oKr1memNd7qfydDrsRAWaCCh2DOSE003kK6IPCLB2cZfBnT1jddAOJ2oaNxlsBO 4AhwCaUb/KpFIeeCWzHognKtPiF5jnRXPG+GVrPgofbbsmNnfkCdSH+Bh9izboai2PMzOzyZa 5agmrOIMrDjFK6Y47gH6oACRcjHG27E3U5OPeE0ZWAJVqlJKKSkfL6uSGljFw3BYAufnjiDWR v4EQ5C031+iFHu0/74qU8lL1a79Rr/tS9VEF//lsrymMOJyh5B2gaxqzaW3BXOH6tX6z1rahK oIShQpZJltW918fOl9S63dZD9a1woqFD3C852poBPguDi01XZ4xFDKeXQsr6bEMNCdiMEwp/o ZLEy9vEXHrmJr48tVL5aUgpegSi/YiuKOqRMGNvuw+1XrWkql+fu/MISU0AKXaQE5X6CdUi95 +8y20YvnuQ7KAsd1A3EiP4vZEuMYKnJtvIMgJxVyjzZr7TgFMALvGIyY/9q+MT1D48ikjZvK4 2EQSUWPrssdsq5Szor1IOklE1K+w9GCgjIivKr4TB/qfEj7N9SScW5ILG5PWlbwpo9CjuDNru kraHVvNnjX6T9fUuxN7/nmiGTcmh4yu2k8PjxO/RLlhbl2wpTt2E+htOBeRfALZxa1LvFjn9B KDzV4xJew2xZxlE0edoAXRCBjPNEFRYtKCFVBuSeetWPpAbuL4apg0wxcqo5S2hDujuRSPZpY Mq0M+Kl9MfQN/f6jf7pXGXKY9qHey8+CRwJG6n38CyKQu2eg220HmK1zoEkjR/c/crJdHDKs/ EXYaWUb 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:20:30 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/char/virtio_console.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 69c6718..0c4d4e7 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -431,7 +431,7 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size, buf = kmalloc(sizeof(*buf) + sizeof(struct scatterlist) * pages, GFP_KERNEL); if (!buf) - goto fail; + goto exit; buf->sgpages = pages; if (pages > 0) { @@ -451,7 +451,7 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size, * in dma-coherent.c */ if (!vq->vdev->dev.parent || !vq->vdev->dev.parent->parent) - goto free_buf; + goto free_buffer; buf->dev = vq->vdev->dev.parent->parent; /* Increase device refcnt to avoid freeing it */ @@ -464,15 +464,14 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size, } if (!buf->buf) - goto free_buf; + goto free_buffer; buf->len = 0; buf->offset = 0; buf->size = buf_size; return buf; - -free_buf: + free_buffer: kfree(buf); -fail: + exit: return NULL; } -- 2.10.0