From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762896AbcINOKd (ORCPT ); Wed, 14 Sep 2016 10:10:33 -0400 Received: from mout.web.de ([217.72.192.78]:49841 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762054AbcINOK1 (ORCPT ); Wed, 14 Sep 2016 10:10:27 -0400 Subject: [PATCH 11/11] virtio_console: Rename a jump label in five functions 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: <3fe1a284-eda5-9951-c978-17fa4ea7d501@users.sourceforge.net> Date: Wed, 14 Sep 2016 16:10:04 +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:/EVtoCtjANp+e/I6/2k4PXkuqiUgnOf5EXUgfbZb0xWjRKrv/mc 1Qjti8JHmSlcBs0gIxMfs2tgXjqrIoOpAyCRIeUUQChlM58uWCMfJf352Zym0HQHvuSTuAe zuAqPwprmgwow++sNlyaz1+m/sVwwJcaW3A8IwBwOxkSqVLfjg73M6iAPPtpPfOf5uZCelH 4OaRDwjwmsvIUXzukimnw== X-UI-Out-Filterresults: notjunk:1;V01:K0:DHRPK4Tpvm4=:HWCxFzOEuYT35L7//+MsSz xnOMkWNXOTToYAApJhzoJ08mztkD+Xoy1qFNEBnDr2tkJJc2Yx61h47Plmn6MCEib6TFuXnjt qPNPkQb+5rFo++9LR9tIFr3dGTRjsmEIc6B8mpqlNeWhgJL4Aqd0JTN7fggcKZGOSPRk91o2i o94lsvGdI7RVw05H3o6zXVIgx0f2e2XfKsbBTMnHYY0/9Vd+3xyME149S14xLsqz7hOEzpH12 iYuCRqli2/L8B74tNnkysE0uEhk+5dtW5dvE468sj5Xd32PWmTwx+/DLewYuC2YLto3ybjh4e KkOGUBko3mtvsvfTarfkmv9LCudFXXZP2ccONK4rhSfjOrgVZaDVME+MYnpH6uBpds3HiEgEY pFPNA2zCgDvglhFqaCWiCG77s91ssnNr9UeU3IsfWOG4oVp0hG3ZrZYwZ3VmDCTo8sc5qkDWG SaQFAMVnY/YN9XFZq9xd82eN0PuvDl24ps5H4NowYZGxQ57FfK92T8q1CUUgK8Rkl2opHk8JC ADh1LBZLdZ9RGRfIoVylTYjOWFxuWrL7SNQgPDiMnMOUGvblCuTOsdiX/uxDmki+SgJSr0WSa I8iI1JCWPO93015uhKarnYB1bTwaf2OOP4mDj7TbY13rfpfPe7dvlvUOMHSaO2U7fR3+sIa1T sD2OENb0a5JiLYG2cuzKhfHaCSgqg0l4FClf966ugeCNARj6aFIsVb8xBOcTkcMpyETqjOisz hTbiqHAkixkPI9qZQV1ggxce2nNuhwDOPs+g6wj2ashO3Npmua8t7douGvheyjzEVQ8AESvQo UlTRnk3 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:37:52 +0200 Adjust a jump label according to the current Linux coding style convention. Thus replace the identifier "out" by "unlock". Signed-off-by: Markus Elfring --- drivers/char/virtio_console.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 0c4d4e7..6c90c9c 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -257,11 +257,11 @@ static struct port *find_port_by_vtermno(u32 vtermno) list_for_each_entry(cons, &pdrvdata.consoles, list) { if (cons->vtermno == vtermno) { port = container_of(cons, struct port, cons); - goto out; + goto unlock; } } port = NULL; -out: + unlock: spin_unlock_irqrestore(&pdrvdata_lock, flags); return port; } @@ -276,11 +276,11 @@ static struct port *find_port_by_devt_in_portdev(struct ports_device *portdev, list_for_each_entry(port, &portdev->ports, list) { if (port->cdev->dev == dev) { kref_get(&port->kref); - goto out; + goto unlock; } } port = NULL; -out: + unlock: spin_unlock_irqrestore(&portdev->ports_lock, flags); return port; @@ -296,10 +296,10 @@ static struct port *find_port_by_devt(dev_t dev) list_for_each_entry(portdev, &pdrvdata.portdevs, list) { port = find_port_by_devt_in_portdev(portdev, dev); if (port) - goto out; + goto unlock; } port = NULL; -out: + unlock: spin_unlock_irqrestore(&pdrvdata_lock, flags); return port; } @@ -312,9 +312,9 @@ static struct port *find_port_by_id(struct ports_device *portdev, u32 id) spin_lock_irqsave(&portdev->ports_lock, flags); list_for_each_entry(port, &portdev->ports, list) if (port->id == id) - goto out; + goto unlock; port = NULL; -out: + unlock: spin_unlock_irqrestore(&portdev->ports_lock, flags); return port; @@ -329,9 +329,9 @@ static struct port *find_port_by_vq(struct ports_device *portdev, spin_lock_irqsave(&portdev->ports_lock, flags); list_for_each_entry(port, &portdev->ports, list) if (port->in_vq == vq || port->out_vq == vq) - goto out; + goto unlock; port = NULL; -out: + unlock: spin_unlock_irqrestore(&portdev->ports_lock, flags); return port; } -- 2.10.0