From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754727AbbL0VXI (ORCPT ); Sun, 27 Dec 2015 16:23:08 -0500 Received: from mout.web.de ([212.227.17.12]:49466 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753386AbbL0VXG (ORCPT ); Sun, 27 Dec 2015 16:23:06 -0500 Subject: [PATCH] [media] bttv: Returning only value constants in two functions References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall To: linux-media@vger.kernel.org, Mauro Carvalho Chehab From: SF Markus Elfring Message-ID: <568056A1.8050602@users.sourceforge.net> Date: Sun, 27 Dec 2015 22:22:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:VBX5k8kzLWZYKGlw6mDvIyDa5dS75X4heNsfRjkeja55SL1KaEc p8U+XMSpIHWx+F41k5IvvgNlV2Z5e6QEufONGDL0EzJW7MQ0n8VT/HVc6FIXPzVvT/qvVvI RK9UeOCi73StxUNG25e8fcxo2Ft0N9MD9KjMMZ5toA8OmfXuiU2sE2uCIDs9vhMTMXKjIcC +2ctjcQKCn+wUYtiseCdQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:oTZEfuM0ixs=:BhD5CMvdWSN8PlxOpaM/9R 4o3uRmFNbjx0q8gv99+35yAlTGdmu4Bzu/tz6bA6WuUmfBsCJehhVAb+SEc9Q0XqVyi3LVsn4 7GFbuEJIQFlYDi+Csp3sNKpTNCPQAEhdo14XFushOVgT9jCbDX+3uMpEQmZmAK8RmvCVBE3a6 aa3eslmITwZ4mcjVpZvUIe1cpDMp/KjTBp9YdINVGJJXGtBjw1iAsKl0eohVVdkUf2Anetmzi 4isEL4twKJZU0V/Jj08/A31VSSf8eVw/WmWhNSh76LeCsdYbqCzg3iFwDrArsbmBUpornw7DZ lpWPdB0Mb43ngXuMcvh7qFAhYxbeXSbJ+szhsi1C+tnpLa+k+ngecZ2+L/265kEsV7kJZOe0k NvnEe3nf4YyJg73GjTwsYXVzGJZzXU88b2MGKQL3TbFd2m3hlkwoHjKpZsUG8x8Csm8myzt3s T7SKzTXoHAyTMegJacACnJoSlPZqvDjOrVGyhMmr6maDmfwoGU5tMxFVQOzMi4+Df4xIStKCf WTYmMpWeQnSYSC/1nf3Mt4+DE7D30tTgP63EU/ShfOwPGg1fBaGvqyL77wUOTUP4ysYv5Sio3 J9RKglHjUnto29Uxsq7BmyYo7Igst3uAPopJlrGgKoPVy0b0ZsGbWTyPRR6mJ35S5s2uVB00O w7WFEZ5RT/QCQJlP8REMw/VUG0L+pz2FypUXjcvGB+XcCnlF0Z8gAeNV8s9TPoyiTB71yaN31 LVV6TL4qHdFkYFNqSh5SAmrYPBLaiiUifWlufaYOYKLUFzpgK5Fgsb4BthiISpn+gh1yhlW8y 6NrUVZg Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 27 Dec 2015 22:02:21 +0100 Return constant integer values without storing them in the local variable "err" or "rc". Signed-off-by: Markus Elfring --- drivers/media/pci/bt8xx/bttv-driver.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 9400e99..cd7d6ef 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -1726,22 +1726,15 @@ static int bttv_s_std(struct file *file, void *priv, v4l2_std_id id) struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; unsigned int i; - int err = 0; for (i = 0; i < BTTV_TVNORMS; i++) if (id & bttv_tvnorms[i].v4l2_id) break; - if (i == BTTV_TVNORMS) { - err = -EINVAL; - goto err; - } - + if (i == BTTV_TVNORMS) + return -EINVAL; btv->std = id; set_tvnorm(btv, i); - -err: - - return err; + return 0; } static int bttv_g_std(struct file *file, void *priv, v4l2_std_id *id) @@ -1770,12 +1763,9 @@ static int bttv_enum_input(struct file *file, void *priv, { struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; - int rc = 0; - if (i->index >= bttv_tvcards[btv->c.type].video_inputs) { - rc = -EINVAL; - goto err; - } + if (i->index >= bttv_tvcards[btv->c.type].video_inputs) + return -EINVAL; i->type = V4L2_INPUT_TYPE_CAMERA; i->audioset = 0; @@ -1799,10 +1789,7 @@ static int bttv_enum_input(struct file *file, void *priv, } i->std = BTTV_NORMS; - -err: - - return rc; + return 0; } static int bttv_g_input(struct file *file, void *priv, unsigned int *i) -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 27 Dec 2015 21:22:41 +0000 Subject: [PATCH] [media] bttv: Returning only value constants in two functions Message-Id: <568056A1.8050602@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-media@vger.kernel.org, Mauro Carvalho Chehab Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Sun, 27 Dec 2015 22:02:21 +0100 Return constant integer values without storing them in the local variable "err" or "rc". Signed-off-by: Markus Elfring --- drivers/media/pci/bt8xx/bttv-driver.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 9400e99..cd7d6ef 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -1726,22 +1726,15 @@ static int bttv_s_std(struct file *file, void *priv, v4l2_std_id id) struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; unsigned int i; - int err = 0; for (i = 0; i < BTTV_TVNORMS; i++) if (id & bttv_tvnorms[i].v4l2_id) break; - if (i = BTTV_TVNORMS) { - err = -EINVAL; - goto err; - } - + if (i = BTTV_TVNORMS) + return -EINVAL; btv->std = id; set_tvnorm(btv, i); - -err: - - return err; + return 0; } static int bttv_g_std(struct file *file, void *priv, v4l2_std_id *id) @@ -1770,12 +1763,9 @@ static int bttv_enum_input(struct file *file, void *priv, { struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; - int rc = 0; - if (i->index >= bttv_tvcards[btv->c.type].video_inputs) { - rc = -EINVAL; - goto err; - } + if (i->index >= bttv_tvcards[btv->c.type].video_inputs) + return -EINVAL; i->type = V4L2_INPUT_TYPE_CAMERA; i->audioset = 0; @@ -1799,10 +1789,7 @@ static int bttv_enum_input(struct file *file, void *priv, } i->std = BTTV_NORMS; - -err: - - return rc; + return 0; } static int bttv_g_input(struct file *file, void *priv, unsigned int *i) -- 2.6.3