From patchwork Wed Oct 12 14:48:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9373349 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DCAA960487 for ; Wed, 12 Oct 2016 14:55:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBE1929526 for ; Wed, 12 Oct 2016 14:55:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDE2D29596; Wed, 12 Oct 2016 14:55:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BDBA267EC for ; Wed, 12 Oct 2016 14:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933688AbcJLOz0 (ORCPT ); Wed, 12 Oct 2016 10:55:26 -0400 Received: from mout.web.de ([217.72.192.78]:58627 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933642AbcJLOzY (ORCPT ); Wed, 12 Oct 2016 10:55:24 -0400 Received: from [192.168.1.2] ([78.49.9.22]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0LilNJ-1bIEj715AL-00czXl; Wed, 12 Oct 2016 16:48:40 +0200 Subject: [PATCH 11/34] [media] DaVinci-VPBE: Rename a jump label in vpbe_set_output() To: linux-media@vger.kernel.org, Hans Verkuil , "Lad, Prabhakar" , Mauro Carvalho Chehab References: Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <0fb1a9a0-cf02-51a1-6fe7-6d7be501e0d9@users.sourceforge.net> Date: Wed, 12 Oct 2016 16:48:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:nAekasBuG4E+6gg0VDgkrILExPr7XANHTnSWXanW476bVaRtjbp l56bt+nBV3dP9Hsj9GkO6iRWFchuLyHpsnGoYuHxZXtZwvJcdd8LsLmCdcNegMeR6Jc7nk6 LIREE9fk1j6MnwER2QnfW+RM/Xt80Z/5PSvfo3jW6EH3+6t3UCI3OkQMwjUnPetnCqBTRM2 QnVThDHW7zt2rvJWmoojw== X-UI-Out-Filterresults: notjunk:1; V01:K0:PETWySMu7Gs=:BiPN2iGmARmn6+Jbxm/QqP oUX38W98E9viOSIwr2zCmWnxeMRl5zFzru+jxI1CMUm3tlm3Ctzn0jqBFWimJa7fCKuvhpKUi jJN40+M9/gpV8l9QZMM9Gq/pOGoNKgfZNoJOEJHotntoEYEdkvdOvUA63nGV0WvIG58LoalWP TAgz/YRuAjChy2sgHhwpfU4jxAOrWqbuEJq/PEKo3mefHPlt/6mhHkxVJPt4DXILp4EuYnC0K g4+jriYfczqS6LAu6JDH6Qy0iBE+wi6G85NeC3UfostUcjx7U+wJXXD97yKwMXei1Co5YtzA/ k9O2a+sJSdZcdk1m0aSr+13Bkd7JU9C8RxxOfunrihY9PGe3LqWZSc+D9ON8OGulzBI1VnW4n t/GyBpHPfkemtUX9ObJ3iIZT30Izt9/FEGVG77frySCAMTz4+jc03KvkwNzWCq5eqlNOsDSHP Jt3yeMklyPd4WTHzr77mDe+wlv/IkLiurEZYlTd/qts12v1MB5TzayshE5cNwTpNzM7OTgMg2 lwAUFwvnjSSbYTYp3Rnutn5uxmsEgereAD1RXbjmXN4TWpq5T4cMlNYWuT7aUZABGQL0z1cRr 6h9E/PYROCLeoWmlNX/TllHvmgZcvqXGg+n2MIYXfd9VWbTv9i/J3sKTmvafykAZV94xeAdvC m18zOihFHeF6CkPsJBxFeX6ZOKLdFOqEK+YAuQljemd0R2tlsRvP3vZ/m/bChkEiuc5H7dgTB sJ1BLh2S0eeALW7Dyj80lOhJyggLW0bQOZj1hjSUdP9gTcdm8LiwmQ1BALcxRELZkdf8czvRN sol19kE Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 12 Oct 2016 10:10:19 +0200 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/media/platform/davinci/vpbe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index 6e7b0df..e68a792 100644 --- a/drivers/media/platform/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c @@ -253,20 +253,20 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index) sd_index = vpbe_find_encoder_sd_index(cfg, index); if (sd_index < 0) { ret = -EINVAL; - goto out; + goto unlock; } ret = venc_device->setup_if_config(cfg ->outputs[index].if_params); if (ret) - goto out; + goto unlock; } /* Set output at the encoder */ ret = v4l2_subdev_call(vpbe_dev->encoders[sd_index], video, s_routing, 0, enc_out_index, 0); if (ret) - goto out; + goto unlock; /* * It is assumed that venc or extenal encoder will set a default @@ -288,7 +288,7 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index) vpbe_dev->current_sd_index = sd_index; vpbe_dev->current_out_index = index; } -out: +unlock: mutex_unlock(&vpbe_dev->lock); return ret; }