From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755537AbcHSSaQ (ORCPT ); Fri, 19 Aug 2016 14:30:16 -0400 Received: from mout.web.de ([217.72.192.78]:51752 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754761AbcHSSaO (ORCPT ); Fri, 19 Aug 2016 14:30:14 -0400 Subject: [PATCH 2/2] misc/mic/vop: Rename jump labels in vop_ioctl() To: Ashutosh Dixit , Sudeep Dutt References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Greg Kroah-Hartman From: SF Markus Elfring Message-ID: <2b6ace93-f2a9-1224-f6d1-d1054b08240f@users.sourceforge.net> Date: Fri, 19 Aug 2016 20:30:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:K34EalfYbjdqBbsQXmO+yJIL/Ep46d8xEIpuKi7mydopOFgObZ0 zIQ8Djlk851dO5FawEPXFxU+FAO1JqUdA5+8jo22RN/GjIo6XEjPhw+zWwzQUcZnAxFrL2M sqJThDeBizMnFUNxDyIKrE2OR+NPcJ0ER0cP5XNFRO9V7zttgs7Rg+zfUn0Qcg/5dg658S0 gDhMpjECal84QAyCDiA7w== X-UI-Out-Filterresults: notjunk:1;V01:K0:na61uxiCOKU=:VRfqQF1jlbDCmtQyOUPrx/ 3aJ38YdDOrMLbEdhhrwWCCYb87Sw9Y4qognVWzWE5+txniuySlTq3Eq1pk9lN29fgcoauUlJo 5t7Bt84N1opjEGYIx4aNUFiaMqtstIjj5/hd1m344N4EAb9P+nI4tesWkSvRef7eTcQZIOn04 AJs+QwKePcRtXo1iHU7C7DeaT8MI8kZwFeKesGLPLkgULKtzKwoEhToTw3Rhy/RAKt6Nc7tBK YUe6swMx19mATAQ/rhMnUI1ymCQofdiCRK89bwBaWRdIDWe2XzvENLai8/0RZK66CPkvx9NzT KOnr/q5mR2E3I2LG5WBrycRy3QaSQKjFwKBIhKe7lEa4boChSuUIfC2BkLQFsDvEq9uFralqK f0Q3pXq6zYdDGLQnTJ8QivN7xMrPfTlsdsi1itGbbf9cF0XHYvSsYKlbl1Fq/QLBSPus15oeo 75aYhaADUwim8GJEEStoJcS8Bq58irj1p57nZ1s9WYUXIf0vea3zd3J7Q0BMx4Vv1XShwqGMC aT6EeJ7jxRAxhV9QpofYo8cVc7RpvvIF1GRar+dfrCPH0uq9fd1Mh5na1fQLvQsZA+Xodz8DR Gbu6F9YdOYa1Qq07+4MkWSVgQyf+dxUhGY8E6iUEAO8B+YNimK7g7B8vaa98LkCfsMvV3FLb0 ur7IJ6SWAFwwekj41gOBGYrhK3JAfRzupgRcYNNkdLJgXJQn8wRPQ8P5EPXCzx66hFZ52ybi1 v4d2JrMOf/ZkYAaoQW9jztqk2/uLu1XLL72oz/LpyCu1XnaEjnr8idk1Dvt+Y0R5Mu5EUNOlG OEOlXGK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 19 Aug 2016 20:02:50 +0200 Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/misc/mic/vop/vop_vringh.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c index 84c95fe..201a662 100644 --- a/drivers/misc/mic/vop/vop_vringh.c +++ b/drivers/misc/mic/vop/vop_vringh.c @@ -944,18 +944,18 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg) /* Ensure desc has not changed between the two reads */ if (memcmp(&dd, dd_config, sizeof(dd))) { ret = -EINVAL; - goto free_ret; + goto free_config; } mutex_lock(&vdev->vdev_mutex); mutex_lock(&vi->vop_mutex); ret = vop_virtio_add_device(vdev, dd_config); if (ret) - goto unlock_ret; + goto unlock_device_addition; list_add_tail(&vdev->list, &vi->vdev_list); -unlock_ret: +unlock_device_addition: mutex_unlock(&vi->vop_mutex); mutex_unlock(&vdev->vdev_mutex); -free_ret: +free_config: kfree(dd_config); return ret; } @@ -966,21 +966,21 @@ free_ret: mutex_lock(&vdev->vdev_mutex); ret = vop_vdev_inited(vdev); if (ret) - goto _unlock_ret; + goto unlock_desc_copy; if (copy_from_user(©, argp, sizeof(copy))) { ret = -EFAULT; - goto _unlock_ret; + goto unlock_desc_copy; } ret = vop_virtio_copy_desc(vdev, ©); if (ret < 0) - goto _unlock_ret; + goto unlock_desc_copy; if (copy_to_user( &((struct mic_copy_desc __user *)argp)->out_len, ©.out_len, sizeof(copy.out_len))) ret = -EFAULT; -_unlock_ret: +unlock_desc_copy: mutex_unlock(&vdev->vdev_mutex); return ret; } @@ -991,15 +991,15 @@ _unlock_ret: mutex_lock(&vdev->vdev_mutex); ret = vop_vdev_inited(vdev); if (ret) - goto __unlock_ret; + goto unlock_config_change; buf = memdup_user(argp, vdev->dd->config_len); if (IS_ERR(buf)) { ret = PTR_ERR(buf); - goto __unlock_ret; + goto unlock_config_change; } ret = vop_virtio_config_change(vdev, buf); kfree(buf); -__unlock_ret: +unlock_config_change: mutex_unlock(&vdev->vdev_mutex); return ret; } -- 2.9.3