From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763409AbcINOE3 (ORCPT ); Wed, 14 Sep 2016 10:04:29 -0400 Received: from mout.web.de ([212.227.17.12]:59616 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755775AbcINOE0 (ORCPT ); Wed, 14 Sep 2016 10:04:26 -0400 Subject: [PATCH 05/11] virtio_console: Rename jump labels in add_port() 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: <85ca0841-c36d-12d2-b978-dbac04e19c5d@users.sourceforge.net> Date: Wed, 14 Sep 2016 16:04: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:VkvMZWYuSvdQYe0rydtfKoFuBCPoL/dnSeUSYPbJ6g7sT4CUqfF SC/Tve7K2fZqtNaDOZzqtrSVjhuYFB8NZejw+kXsfF65/nQWMfOLN6PZjIl37cakLq2xfpN MUoGU62h/4aRBTty5WLFUIyOFuym0dtr24WTLovwH9gJFLN/kquB5C3ccq2GdZbT0DQYlHP TwVuUjQ1fJ9pTyCWSuKSw== X-UI-Out-Filterresults: notjunk:1;V01:K0:cBhC6n5+2xY=:WaEZldhwbwaZ8hXItnq3Zi 3FXQCpXqyGo+/rNmdf0PMzse+a1qDVLHqN9eCtsWpFnA+PQM4cMLDqVehAuJeKrkpiTihbDRA /NmnApTfKCMQ8SRbBx2gRjrEz2mdeQU1u31Za2fPM0qc2mMYy6qO+2tvdbHzcbdyhMdAufaNT ZFtUJFrvW7PkKQaThr8C42RRotPPxQe1DgzvPAbrw9r/bqa54wPZ5h8zTlAMwloc038IAf9KL dvJiXYLX2mZLmR1T/1ZbTHsWtsyRxlb0Gr0VawaGsuLoHzecdXsg892KDRsEp5KgzWZ0Jfid7 R0v73Cz42P1JSyLhK80GNmcQQb64jkvzuTHS/phGauDU9IclGinqubVKDvTqtTX62uo+FvRQ+ 6Y31qzcPF+tVCSm5MIdDev47oPFqcv3OgH0I/6Dysabi4/s4du5mhdGa3bFZk5CShaN5Xwveo kUa31zFpADXGEN6BB57HQmJ7jZ1K0bKzcJmIQv+bJqyOC+C7Uj8tEQvH6miY7BsxDQxVCkYiC zVB6YOtuP4MCuLpEUkZcQwcVjnzGWaB38XZCfya3PiDaFd1ln6pHpzikGbOTcPhVtpDHLDFBx ZAQ63zwZIYZcx0slbW0EJl4aYQuIfqCPzHPu8alDGq6e4mFuLSoIzum4+Zhyac7cuvgcRJEs2 97zZ0O1TtX9yMJjm6qHWJ15W/jCYE66TfpXQzE8GLaNBVV63yLjtgzIuEGEPML0PL/BDViNhX rUOT/qulKhvG3eWW9Yg6EHC5KH1xQI2nerKL8K1tTKm7uDjcck3W3zWJaT55rSYj5osMSZy/d EOeWpoV 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:53:00 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/char/virtio_console.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 768bbb7..40b8775 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1399,7 +1399,7 @@ static int add_port(struct ports_device *portdev, u32 id) port = kmalloc(sizeof(*port), GFP_KERNEL); if (!port) { err = -ENOMEM; - goto fail; + goto send_control_message; } kref_init(&port->kref); @@ -1434,7 +1434,7 @@ static int add_port(struct ports_device *portdev, u32 id) if (err < 0) { dev_err(&port->portdev->vdev->dev, "Error %d adding cdev for port %u\n", err, id); - goto free_cdev; + goto delete_cdev; } port->dev = device_create(pdrvdata.class, &port->portdev->vdev->dev, devt, port, "vport%up%u", @@ -1444,7 +1444,7 @@ static int add_port(struct ports_device *portdev, u32 id) dev_err(&port->portdev->vdev->dev, "Error %d creating device for port %u\n", err, id); - goto free_cdev; + goto delete_cdev; } spin_lock_init(&port->inbuf_lock); @@ -1456,7 +1456,7 @@ static int add_port(struct ports_device *portdev, u32 id) if (!nr_added_bufs) { dev_err(port->dev, "Error allocating inbufs\n"); err = -ENOMEM; - goto free_device; + goto destroy_device; } if (is_rproc_serial(port->portdev->vdev)) @@ -1473,7 +1473,7 @@ static int add_port(struct ports_device *portdev, u32 id) */ err = init_port_console(port); if (err) - goto free_inbufs; + goto free_buffers; } spin_lock_irq(&portdev->ports_lock); @@ -1500,17 +1500,16 @@ static int add_port(struct ports_device *portdev, u32 id) &port_debugfs_ops); } return 0; - -free_inbufs: + free_buffers: while ((buf = virtqueue_detach_unused_buf(port->in_vq))) free_buf(buf, true); -free_device: + destroy_device: device_destroy(pdrvdata.class, port->dev->devt); -free_cdev: + delete_cdev: cdev_del(port->cdev); -free_port: + free_port: kfree(port); -fail: + send_control_message: /* The host might want to notify management sw about port add failure */ __send_control_msg(portdev, id, VIRTIO_CONSOLE_PORT_READY, 0); return err; -- 2.10.0