Received: by 10.223.185.116 with SMTP id b49csp5928180wrg; Wed, 28 Feb 2018 00:48:03 -0800 (PST) X-Google-Smtp-Source: AG47ELux3XL7IBuXmLgyC/1DwkhP2mf1muysfM+X1YmhGL2iOUMNsP22C1ekOrgSB23Bij6a0ThK X-Received: by 2002:a17:902:4001:: with SMTP id b1-v6mr8533056pld.28.1519807683730; Wed, 28 Feb 2018 00:48:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519807683; cv=none; d=google.com; s=arc-20160816; b=rlucdCSRmD+vdEAgFscawr6gLrwxtNcG6fFkFmfwIJ1wKkmTGu7/Gzt5YleQs3Mz1r NOLDKUowuvO9kmdG9q3n7wQMQsrrLG16XURWkT+5ZqtlpEkz4F4FhBK+E8PLwj2+IbtX TIeXxtO2pEIj/hw8TNKgmXs8qJbtQ77QQAkdUpBRQ9xXENZOndYivxn/HSwWW51wTyIE NSVLMlb8Tay3JZl5Q8zE3O7Zmy6U0DEANnN2DTmk3epITC9NCn7JH3lbJ+WR+hxX43BP WAwEfEQTpiRgKWwqkraipU4aFdp871HiBhyZDLvuWEQTdikhQ6Htd/vcvdRdlf8BbDeS J3wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:arc-authentication-results; bh=aomku84TUy1n5DsQgGvjQNBiX87T72RLfMVi8LSW340=; b=WH7crWQScWTq2gJOH60IRA8Vt4BbwQRmVCQSdlCfe4YrsGt2mj5yBfn3tt93l1jYHF GT8ZFOQFJKirHciFr7xIatmE6US79HKI6qU3Z8O2OLnc6r1KvqP6VoenPe9DOCG/n2BR EP5Bs3gCpWJ2SIzFIZn4Ri8Gh3WhbTYrniLM9M2N7V646ZM49E1xH9kbQPIdtAdnE2i2 pLigpaUHBBbwfvE+rCfm2Mm+3Y1jdgzIc4Y9/ByxR84DGC1eREDBUMjNOkalUp+YtWZd Z9VxG3yoSv+9dvwlqTJMs8t7Recw8gjPBvib3bJOaIQE+kDCbAXYIo0kS6+ISmOj1312 KMNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 11-v6si937128plb.316.2018.02.28.00.47.47; Wed, 28 Feb 2018 00:48:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbeB1Iq5 (ORCPT + 99 others); Wed, 28 Feb 2018 03:46:57 -0500 Received: from mout.web.de ([212.227.17.12]:59205 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751777AbeB1Iqy (ORCPT ); Wed, 28 Feb 2018 03:46:54 -0500 Received: from [192.168.1.2] ([78.49.198.143]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Ma2Pz-1f9Ink3SOd-00LjbG; Wed, 28 Feb 2018 09:45:40 +0100 Subject: Re: [v2] [media] Use common error handling code in 20 functions To: Laurent Pinchart , linux-media@vger.kernel.org Cc: Al Viro , Andi Shyti , Andrew Morton , Andrey Utkin , Arvind Yadav , Bhumika Goyal , Bjorn Helgaas , Brian Johnson , =?UTF-8?Q?Christoph_B=c3=b6hmwalder?= , Christophe Jaillet , Colin Ian King , Daniele Nicolodi , =?UTF-8?Q?David_H=c3=a4rdeman?= , Devendra Sharma , "Gustavo A. R. Silva" , Hans Verkuil , Inki Dae , Joe Perches , Kees Cook , Masahiro Yamada , Mauro Carvalho Chehab , Max Kellermann , Mike Isely , Philippe Ombredanne , Sakari Ailus , Santosh Kumar Singh , Satendra Singh Thakur , Sean Young , Seung-Woo Kim , Shyam Saini , Thomas Gleixner , Todor Tomov , Wei Yongjun , LKML , kernel-janitors@vger.kernel.org References: <227d2d7c-5aee-1190-1624-26596a048d9c@users.sourceforge.net> <3895609.4O6dNuP5Wm@avalon> From: SF Markus Elfring Message-ID: <783e7eff-2028-72be-b83c-77fc4340484e@users.sourceforge.net> Date: Wed, 28 Feb 2018 09:45:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <3895609.4O6dNuP5Wm@avalon> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Ozmyh7TDnF4lE3X8p6BBPK+j4U4V97gsvaWkfWwx8gEbSiouh6w WN8Nu1wJq6s6aZ1zl1fCxNzocC+C+ERZG0fakUzozi0IzAjSTMJ1scIZXXtqf6C+JraN/6a xp3FcVsowAQyWhCF1cnHfcBJwUGRTu8WJjHPAapqLADhsf1LU7ToWjXBDIaGqN3B6dL3FRA mahyoptwcIPr45zBwLBdQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:XUDhxBj9rwo=:A5aL3OSZd1QApmMOr86vh0 nPyDxWcWNryT3miPgPLsd7q1TN0Gm6bPKi1EKVE/TP834/m+B/6zaJZG9wwNsDIbU9KDp70NF hKZb3qXOwkBDo1I3UhS1eCgXvheIw8NEc6+xxbqXkKGPhdRdowaeGOn9enGiTNR3VMSF+NK10 2/lYp0mq/pHJND7UPbVR4Eculdv9v7RGhTUrre6T3oOCE1rQpaGhHUF6cP/x9vzMEFH7C++yt 6ZQdDQut7HbNrg8ei8/N2mhKZHPZ+wAS2eb/zDXGSRAFTpI9irO6mFK6F07PR7wgb59knkEzd 0jsUc0gSAJ0dv1dSybfqmeuv3LZ4DTeBYb2V0YdhuPoW5Bf0U+/qMFoXrZvZvo3H84PgxqL1l PACLzMdmVzKi/Y9fSfGpwTs5Ak06+Oeiu5WB25Vzn8VwRUllavDasxV9cVVR0L2Ow3bdV1IlG WCmWNPKkp651pSX8PRyemu+ceDuLgwnfu4VUp2APjcaS9IwC2CqSrw60ty28cOBvv5WY4+9gI 1ftjwprT67U5pY91gOpN3PY5/JxjFJJ0rY6PjqeboynNnuwzxsg1PYXfkLrkfjliqovlm8d+O hb5ZV5L7O8YagHlcM1XRDbZKJbuCU0TnY/zKgs2CMFtP7l3C8L6scJPoJUdPEmJ05GlJj1p7+ ZZujta9jqLw3/G+CJd3zFK2GyGkAxD5clfeekKYDq3HaexB8XVrXbLf21xatwjFnANhtzgY5H lJ3AdLO+PV8d7HF76UDWJuFYPkhk2VVD2ctU+gfmP8TpNqSemC+tEm9k20pboCf8Q5CIJx92z j8ylBD+bNVOHNUHWZOxrsUKsglnKQnl8qTV6p8FEyP+7QQCwFg= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >> +put_isp: >> + omap3isp_put(video->isp); >> +delete_fh: >> + v4l2_fh_del(&handle->vfh); >> + v4l2_fh_exit(&handle->vfh); >> + kfree(handle); > > Please prefix the error labels with error_. How often do you really need such an extra prefix? >> +++ b/drivers/media/usb/uvc/uvc_v4l2.c >> @@ -994,10 +994,8 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, >> void *fh, struct v4l2_queryctrl qc = { .id = ctrl->id }; >> >> ret = uvc_query_v4l2_ctrl(chain, &qc); >> - if (ret < 0) { >> - ctrls->error_idx = i; >> - return ret; >> - } >> + if (ret < 0) >> + goto set_index; >> >> ctrl->value = qc.default_value; >> } >> @@ -1013,14 +1011,17 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, >> void *fh, ret = uvc_ctrl_get(chain, ctrl); >> if (ret < 0) { >> uvc_ctrl_rollback(handle); >> - ctrls->error_idx = i; >> - return ret; >> + goto set_index; >> } >> } >> >> ctrls->error_idx = 0; >> >> return uvc_ctrl_rollback(handle); >> + >> +set_index: >> + ctrls->error_idx = i; >> + return ret; >> } > > For uvcvideo I find this to hinder readability I got an other development view. > without adding much added value. There can be a small effect for such a function implementation. > Please drop the uvcvideo change from this patch. Would it be nice if this source code adjustment could be integrated also? Regards, Markus