From patchwork Sat Sep 24 11:10:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9349163 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 85A6E6077A for ; Sat, 24 Sep 2016 11:10:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 767E728CA7 for ; Sat, 24 Sep 2016 11:10:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B4DF28DD1; Sat, 24 Sep 2016 11:10:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E38ED28CA7 for ; Sat, 24 Sep 2016 11:10:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755423AbcIXLKS (ORCPT ); Sat, 24 Sep 2016 07:10:18 -0400 Received: from mout.web.de ([212.227.17.11]:59125 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479AbcIXLKR (ORCPT ); Sat, 24 Sep 2016 07:10:17 -0400 Received: from [192.168.1.2] ([78.53.181.42]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MVLak-1bSEvN3MY2-00Ygan; Sat, 24 Sep 2016 13:10:11 +0200 Subject: [PATCH 2/2] Input-evdev: Rename a jump label in two functions To: linux-input@vger.kernel.org, Dmitry Torokhov , Henrik Rydberg References: <566ABCD9.1060404@users.sourceforge.net> <92cc52f5-c5e1-cafe-76f2-04e4ed997735@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Sat, 24 Sep 2016 13:10:11 +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: <92cc52f5-c5e1-cafe-76f2-04e4ed997735@users.sourceforge.net> X-Provags-ID: V03:K0:CPLoDoC9q8BPQWYsAy8NPHvM+vCXUx27GCKCV/3ihVy3iyHEhZg 27b2inzVHB42vuKHD4nPFEMp1PTJl++Zv3M6OtiwTyLEJZbI31K19B1VKs7TOT77PHZ/oye U5LfDrENzFupOJ4jx3ByXDRXHV6KGHEAEywqvzXZJlUZ2qyipgHgRoiVHJ90/A8xGURDc0y lDEWJsaPC3qbWWpZemFCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:GX1TlDvu9g0=:8gUq0mjweLSdpK72tAsuPH JYVyJIO6X1rQUY70r9AVNn+LZDGoBulF1xG5nksHdycO3rT2mkJ01hiD1S1PCckNyFURi5xG3 Gp11xenEIFYuasPldWHI8zmgsaIAbhkDUKdgDpUNcRMUzrY6eLShzSImj1c/PmqnoHbvle31h XVsGSKESXDB9Bkl8FIFYX59OSedchrNc+U9DqF/VNADx7onLZ0hDFlV0kQowHivz2Eooy0wSV +r+RI1PDlx6NNsnmxwsZzB4M/4kkrGkzurxw+qiLNAtom7OofbuwvWg1PfFwpO2KFE4JAvAo+ 3pb9Lx1HMiC1lCpeIhGv/Y0uPFaaiqBliY/fLurxpd48JSJYzzFKKOy4mLKOzaz1Go0FQGbQI WxN8cdyNAU5b56cVNNh/Aa+ksYne/S6ekZd5Eo/mXa5FTuEMknuaFKm0O+UM+YilFdeQlO+D7 a8RZFiEslYqdadBHAMLyQqO5w8Qr9ENHDtSl6JvCqPa0BLIU2ZAgW+m0oJt5CRtEUfMqZ8WF9 8vKs+gs7OeOmGshKfikuY8hi/Ph7H0W2EEBzwUAqfe4cF9HWgbPeYE/lXgctZ22CiRn/E29qy cew5hg6hgjzSeU+5oIHJpDRnlcbCNp3ZSPN2Ntkslk1L4JCaqUP0woEzFCS1uASQ2ez0hkZ2p vOVbi5nmwV6bdk26wuv4DyI6BNXCT9E+t7nwQhVf8PW8cstMGxnpeMKxOMHAVaCjMQM51WXuJ 2jDTpjMrkAErlM25/tsi21zkyNx1Int+r4YP9nCcVEdUZqAPrlOy2Y9Cz1dvdCc7rVAA/8+2l PBvOXfY Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 24 Sep 2016 12:50:31 +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/input/evdev.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 83fcfd6..548874d 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -545,22 +545,21 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer, if (!evdev->exist || client->revoked) { retval = -ENODEV; - goto out; + goto unlock; } while (retval + input_event_size() <= count) { if (input_event_from_user(buffer + retval, &event)) { retval = -EFAULT; - goto out; + goto unlock; } retval += input_event_size(); input_inject_event(&evdev->handle, event.type, event.code, event.value); } - - out: +unlock: mutex_unlock(&evdev->mutex); return retval; } @@ -1292,12 +1291,11 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, if (!evdev->exist || client->revoked) { retval = -ENODEV; - goto out; + goto unlock; } retval = evdev_do_ioctl(file, cmd, p, compat_mode); - - out: +unlock: mutex_unlock(&evdev->mutex); return retval; }