From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758248AbcIMUpC (ORCPT ); Tue, 13 Sep 2016 16:45:02 -0400 Received: from mout.web.de ([212.227.17.12]:62744 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755330AbcIMUo7 (ORCPT ); Tue, 13 Sep 2016 16:44:59 -0400 Subject: [PATCH 3/7] AGPGART: Rename jump labels in compat_agp_ioctl() To: kernel-janitors@vger.kernel.org, David Airlie References: <566ABCD9.1060404@users.sourceforge.net> <5204ca92-2cdf-8115-567c-4ac29816fcec@users.sourceforge.net> Cc: LKML , Julia Lawall From: SF Markus Elfring Message-ID: Date: Tue, 13 Sep 2016 22:44:55 +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: <5204ca92-2cdf-8115-567c-4ac29816fcec@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:kj142h/IFNkmohnNUHKHIvaWn9DSgtJ8f48XoCxr9g7q0ieD6UG 9pClblaA069aVOFGdL7vXMpTDlaS64X8b2QxB+4E7qGlkRTGPIbQ7WJbpO1bcI7BXSCWKEH mrlAg7KlAKPCBMBrqsTAVyAjPHsUzi7p5Y5WFMg9/ZeMmlCYRuk1kfD2myA0cDDS89VrIGz xG0F30vl0pNYLdwAVEpgg== X-UI-Out-Filterresults: notjunk:1;V01:K0:0OcAibJFTZo=:bRBWTvHln8Lnu8Pu4hMUiN sxBhthil0b9RBBeW2BIH61WFaLcH8bDiTDJN06sx7XgYUJCAHkQlLmSjXcrFik0UxuEjEjNVH jbEpZ3XTzWoOjo3qWdSlbY57dnNWCnhz5RonhFAAJQXS7PgHMxZynZ1Ne6Jdw0mCtFuUOJNtV 8Po+2l/wlB0gQRMckHAKya1Snsmnf35+c/SJO9t3nnTbMXIzvcRd+vB9wI+y5BCCZcARi+N5C SO4UBaEQjh8BjwuID1ihD3r7XxETLuK6LPiBnl8WIh8Y6zRoc7XR5nZu3MzD928N/uDHnUl80 aQV8CDUwtc6F5kyeaJAETgYYRs7tHP8nAlodaCpHx2ACAcS3DMbvrLoxrgq/VPzNjru011n03 YLmbjVkgvTf49V5P6MNIJcSAVne9a/tMJYtOojBf3dSnbwd80l3ZKzhR2gRXSUG1aH7eB6KuB RB2jlAeWLwvEpDCMIaLKnJVlBjmx3x3d7VSniobRYbDuJf3hjlntX2HsihybCJTOSrEbopjJp l1az7oSGAhTQ2lpY1apLHuNtOmK/skI7ayXGfDwZRUJMTPVDavwtFEJuE79oIkHYCQ9Xp/dMQ dfamAZLAVLxhYRpZr5qtptbtfqhuwz8PzXEwCMp6pPED0GcM35zGh7GqLPoaqYr4jwyAMgDvv s8zhSEztcNIjYB9MGd3AJ2o4gQEQwwpzbR55XIuGodssdEVY6AS+YHPucPAIhzI02vT1jf50x CnI6FNTY8IjDuuElUuElXknZ3+5JZX222rtbL334NvGPl+9G5Lj8a8oQf4Vri3dQ7UrHFRXf4 e9poi0D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 13 Sep 2016 21:12:02 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/char/agp/compat_ioctl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c index 68d4dc7..4220956 100644 --- a/drivers/char/agp/compat_ioctl.c +++ b/drivers/char/agp/compat_ioctl.c @@ -209,24 +209,24 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) if ((agp_fe.current_controller == NULL) && (cmd != AGPIOC_ACQUIRE32)) { ret_val = -EINVAL; - goto ioctl_out; + goto unlock; } if ((agp_fe.backend_acquired != true) && (cmd != AGPIOC_ACQUIRE32)) { ret_val = -EBUSY; - goto ioctl_out; + goto unlock; } if (cmd != AGPIOC_ACQUIRE32) { if (!(test_bit(AGP_FF_IS_CONTROLLER, &curr_priv->access_flags))) { ret_val = -EPERM; - goto ioctl_out; + goto unlock; } /* Use the original pid of the controller, * in case it's threaded */ if (agp_fe.current_controller->pid != curr_priv->my_pid) { ret_val = -EBUSY; - goto ioctl_out; + goto unlock; } } @@ -274,8 +274,7 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case AGPIOC_CHIPSET_FLUSH32: break; } - -ioctl_out: + unlock: DBG("ioctl returns %d\n", ret_val); mutex_unlock(&(agp_fe.agp_mutex)); return ret_val; -- 2.10.0