From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763317AbcINODk (ORCPT ); Wed, 14 Sep 2016 10:03:40 -0400 Received: from mout.web.de ([212.227.17.11]:49447 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762136AbcINODi (ORCPT ); Wed, 14 Sep 2016 10:03:38 -0400 Subject: [PATCH 04/11] virtio_console: Rename jump labels in virtcons_probe() 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:03:15 +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:LVW2RmRpzDpGkJ1N2hV6+85NZbW9wr6U3DT/34MNC6Zci2vgfKc opt6jW7XCXH+hVfYnY/jq93twEShPbNE3pTuVldG3pzVtx8oTEOxXPz6YbRrP9bTUgLU1PJ xwO0li0RkzqicJOJedkFOzeoL0+/tbg9jiL6Ch7abVi1Kf7eTWDAGMZieZ6KyqqWrwG7/jM YWKzcozBUnB9xLmt3W3dQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:FwriSr7JVr8=:o3lrV7dqtfpAZuMETUW8wz wGAE8Wn8pJtWgv3shC43MAT3PnJELYM5pBYx1v6VtFK5KhscYzPQXVfDxcPWlYeTLbBCa5bWT a1Yym2A8DOu0HG39jL90uobhjssszWfivKGnrcaSxz3FE2H6BiLwl/h7zIZxOk/TSQXU/vg+1 bdtqhZYYq3R1/eNG2TYTGZ88YMHdF5kgz0rGWexEKufqYYPksWcF864nsdHBYH5hJjkdD0eth NuPUSN+kjhAVt9OcUx6BEacCQo1CNbdJ+zk+RmL19/U3z5vACaBgiQhhgbKzA/y8RWaVPejTA m77oWKLtpplA7JRdYPOU46FLARsXFQ9feQ6y3IqMeE1QCwHamjdV3cJgjaLI0XognzYEJY+vy s8EvC4F0GYl4N22u4halSU33UZu/jSHXiDJXIFY1z4OTSHaNHp1bzNtEo3+2ajXiEhFdtyUIR /SYXr6SmqYgBP0K6Wv27Jh5Ga9e+dmi4QrjHUnHlozC23b5r+Ibgk0HlCadkw/I8WlAOAjyGI KZYOh4TWR5CoLka9TXSt87BEHO31dSXWTxsObXeXZAvgQGKxXPefS7h449e1Ngcaq+TMFY/XV HxpLXqWwQBR9YK5ajaOgmub/jeEOAHSLZnMxmRUwTxM21EuV9wpzBHpau5QiNmmS2YsSxW9mY ydSRXj6yemP0OE/qu7JKuh6qAcqYKRHvxyvaT/iytGWMVo+KKWvNX1oDpKUodPA3AcK9XB75q 9JRs2qxN539EKFkvX8GbWiiv9Qt6oSiHHAaYaKO9Sl2PWV2gfwH8N0ggnUVvc63cC3PnWl7eE MVf7Yn5 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 14:24:05 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/char/virtio_console.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 004314e..768bbb7 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -2037,7 +2037,7 @@ static int virtcons_probe(struct virtio_device *vdev) portdev = kmalloc(sizeof(*portdev), GFP_KERNEL); if (!portdev) { err = -ENOMEM; - goto fail; + goto exit; } /* Attach this portdev to this virtio_device, and vice-versa. */ @@ -2051,7 +2051,7 @@ static int virtcons_probe(struct virtio_device *vdev) "Error %d registering chrdev for device %u\n", portdev->chr_major, vdev->index); err = portdev->chr_major; - goto free; + goto free_port; } multiport = false; @@ -2068,7 +2068,7 @@ static int virtcons_probe(struct virtio_device *vdev) err = init_vqs(portdev); if (err < 0) { dev_err(&vdev->dev, "Error %d initializing vqs\n", err); - goto free_chrdev; + goto unregister; } spin_lock_init(&portdev->ports_lock); @@ -2091,7 +2091,7 @@ static int virtcons_probe(struct virtio_device *vdev) dev_err(&vdev->dev, "Error allocating buffers for control queue\n"); err = -ENOMEM; - goto free_vqs; + goto send_control_message; } } else { /* @@ -2121,17 +2121,16 @@ static int virtcons_probe(struct virtio_device *vdev) wait_for_completion(&early_console_added); return 0; - -free_vqs: + send_control_message: /* The host might want to notify mgmt sw about device add failure */ __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID, VIRTIO_CONSOLE_DEVICE_READY, 0); remove_vqs(portdev); -free_chrdev: + unregister: unregister_chrdev(portdev->chr_major, "virtio-portsdev"); -free: + free_port: kfree(portdev); -fail: + exit: return err; } -- 2.10.0