From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbdIOH5L (ORCPT ); Fri, 15 Sep 2017 03:57:11 -0400 Received: from mout.web.de ([217.72.192.78]:57544 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866AbdIOH5J (ORCPT ); Fri, 15 Sep 2017 03:57:09 -0400 Subject: [PATCH 6/9] [media] tm6000: Use common error handling code in tm6000_cards_setup() From: SF Markus Elfring To: linux-media@vger.kernel.org, Andi Shyti , Andrew Morton , Arvind Yadav , Bhumika Goyal , Christophe Jaillet , =?UTF-8?Q?David_H=c3=a4rdeman?= , Hans Verkuil , Laurent Pinchart , Masahiro Yamada , Mauro Carvalho Chehab , Sakari Ailus , Santosh Kumar Singh , Sean Young , Wei Yongjun Cc: LKML , kernel-janitors@vger.kernel.org References: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Message-ID: <1a2f24a8-6365-cd56-caaf-ff3dbadbd8e7@users.sourceforge.net> Date: Fri, 15 Sep 2017 09:56:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:XywrTYs5z1F8OH96z80o2zeNA7uv+B9b+51ZIjiFdjSbFDe2IGr iccW7S9HfZw6wnRD9zX9dZB8PPK8MAlmIfksMEFpstdLSkK67hZIyewlKa4dt0anlIZrQXQ x9mEFrFKgiGWbmXaEBM9+DWUU+gzUnZu7GZIPlDgUoSPWanCNRrSIV6c7ZLjYIPDm5+h4sU 0LCw2cxrt1/hhftwCLu8A== X-UI-Out-Filterresults: notjunk:1;V01:K0:lBSe7kJYT0I=:YDflQ+ZTUV98v1Shrjrt+Q X82CvQi/9bfNya2DQEWv/GHnlidZv5ZniVzQdYRl3ha2eMLRPDDKm/IZd2X26cW6ZkBrQ2SyX PGXTihZh8CXFEZbM317TDRVM5bmwBvOwzw2uA+wVqsatmSGV+xWR5RAlGFoL/p2fQYsksThFh LjkXE+x0RET3T31aCZG+rCv3m4OHr9rkIX/8Wm90tq92cKjhohq8IimKM0foqmTrchLZfpBjb iiA77ZosKhHuL9+bC4/+LYb8l78lkq/x4KY5lRWR2+KX+vuaP8X4Q7MLS8QXYK68jsCMmvmxO yaaJNYLMHwlG522wo8d+EtNmlaC2jauKrO7CuiOGgOcYff57oAUN7xZQhUQifujjRMeUH5m4M NdmYxvvo/WgbsKg0QlvmUNGZpVFxlRU4cDqb9mf0x3Gt53LCcKWQt9GFVINWNzhmxZ4SwBisO a229GKpjxpYuyk8TFo3KfQJoLe/+HVG194Q4qGba41ZFz+SfAZ9KBCdA850RZwnu09hNCF/20 ZeTCOyeCjdhO/AezZAZ6VydxpZFUFEzpE1y3YS19FygvRKBnvVn/Dq7jq8W09NiFd6yYifi2Q 61DL9GZWigT4D5ISaVSPim8v7bSFm+V7/sXzs7gpzsRFCLDazwVekQH2fbDbOYpI9/M+9Qnnl fpNmoDlFJZyxNN1Wl8JgikcoDgNPOUTMMGhkt/KBjRvHOzDnhNZxoiOTN0NacXYF+vS3AaVb1 Cs7Yn/j/VCZIHZg3yQbj4fmrK5/oyr67vKek5e9llrzLqct/3PwJbTyrZYYk2ltu2KfOP4Odx prsXQVSKde3QfVC+OPW3Yt33EmgOBicOa78vp9Wl3Bkeb7ZJsI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 14 Sep 2017 16:26:42 +0200 Add a jump target so that a bit of exception handling can be better reused in this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/media/usb/tm6000/tm6000-cards.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c index 72dd6b80394f..502e0b38b7f1 100644 --- a/drivers/media/usb/tm6000/tm6000-cards.c +++ b/drivers/media/usb/tm6000/tm6000-cards.c @@ -872,15 +872,14 @@ int tm6000_cards_setup(struct tm6000_core *dev) for (i = 0; i < 2; i++) { rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, dev->gpio.tuner_reset, 0x00); - if (rc < 0) { - printk(KERN_ERR "Error %i doing tuner reset\n", rc); - return rc; - } + if (rc < 0) + goto report_failure; msleep(10); /* Just to be conservative */ rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, dev->gpio.tuner_reset, 0x01); if (rc < 0) { +report_failure: printk(KERN_ERR "Error %i doing tuner reset\n", rc); return rc; } -- 2.14.1