From patchwork Wed Aug 23 12:54:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9917327 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 650E1603FA for ; Wed, 23 Aug 2017 12:55:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56D902893F for ; Wed, 23 Aug 2017 12:55:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B3A928991; Wed, 23 Aug 2017 12:55:31 +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=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 046D42893F for ; Wed, 23 Aug 2017 12:55:29 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D0F7F267712; Wed, 23 Aug 2017 14:54:48 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 67905267713; Wed, 23 Aug 2017 14:54:47 +0200 (CEST) Received: from mout.web.de (mout.web.de [212.227.15.4]) by alsa0.perex.cz (Postfix) with ESMTP id B22CC2664EB for ; Wed, 23 Aug 2017 14:54:45 +0200 (CEST) Received: from [192.168.1.2] ([77.182.78.200]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MZDQ4-1dyjCr1LbA-00KvH3; Wed, 23 Aug 2017 14:54:37 +0200 To: alsa-devel@alsa-project.org, Clemens Ladisch , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto References: <05f76303-7370-ea37-20c2-116c04b850db@users.sourceforge.net> From: SF Markus Elfring Message-ID: <05c137e8-e417-162b-c588-f5fc22be5ed6@users.sourceforge.net> Date: Wed, 23 Aug 2017 14:54:32 +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: Content-Language: en-GB X-Provags-ID: V03:K0:bY4so/ZO6yZ+u9x17eoclqfXdFDetuwQiMpvzR8aJYxJx0fK9C5 2QD4pfyPvEEc1pTy6MUKdyBZvnX0U9puByaGf6FEBA91QaeL1AGKFWNkSatYdByZKu16zri Qk8lTueFQbC3jghDKajWnw5m0w0tHDyKsmhcua00TAfF9z1d8/1Z5WJKz8z0bQhiy7X0xtj M74z5K4rp9R/zYsWOurJw== X-UI-Out-Filterresults: notjunk:1; V01:K0:r2q/zlw55eI=:yXuXJ9mig5rqzB6VfhZLU/ tE7mFo9IvzDu8yrM4cfCdNztkJlx8lGjy6Ih4r+wBO3SyCT39NEVilxH38WbgHhGSfEM5CwVt yCXYf9y81ZE2RWGZXbRuRq6RaRElw5aVuHaRMEzLnSEGQ2nVf2ZOcLfMTx65GCfCTXQGxq/mO oo308t6ZPtrHqznFForH02zTEmn6Vx9uiyweKuaMz4U1eu3S4DuVeQOBaxDNhN6vXI4JkTDaz mnyXDhBAmgRSUfoG+561w/sWcOqGsnbhJRbirUjQnduLlldba/7MW1TUCL1WhACWSkiB7a1Uf rKMx9rZ1V0YK4I38m5oFH4bDcg5XhV6+WFCETAJKiYhANV1TaDoC902liLuNDGLiwkOHPVBe6 1I7hgRo8OQc8+NxiIfXr15eFxSMx33ciOKhU/wF6O6aKn4zktnluS0oWXSvsXGj7XuOY25JjM yky2FnLPflEqp5+gV5bdbqiEtXXgKOXlU5dRzI0zI84vhshHO4yT+aew3zZRImkDdSSZaeWOE lpZTG9pEtKwlFg32CZxvfhwex3bujihiuHF9V6XGbQ0H02WNLr0b+fYfwNxO4D+Rz5kdHf0/8 HH+2FIndAYgxGqoGIWe0al5i6AV2ohBDhUPaEtMndEBi/lRn9ZG2/l1y+Y18g0AADuFa8t8Tr dbBReSFvilFdS+h/mr/qz9O8Ew+hD1GRzt3Gjmwh95SEEFpaIw6oW+bOzqWdEmsp6PUukQIk8 K5AzmOUATAbTCL7VTc/3Of9wygjvhx6wBPVtVZL0LU2XZwg6Yrii62AuzugtvhYJ3DCn1/tBn FUj/RydCEFtXTOi0VssYX2rbpgW2Uj9oIjVtZbvCdjMHdFRCis= Cc: kernel-janitors@vger.kernel.org, LKML Subject: [alsa-devel] [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 23 Aug 2017 14:45:20 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Reviewed-by: Takashi Sakamoto --- v2: It seems that a source code adjustment was requested by Takashi Sakamoto for another if branch. sound/firewire/fireface/ff-pcm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c index d12a0e3a4219..e3c16308363d 100644 --- a/sound/firewire/fireface/ff-pcm.c +++ b/sound/firewire/fireface/ff-pcm.c @@ -138,16 +138,12 @@ static int pcm_open(struct snd_pcm_substream *substream) return err; err = pcm_init_hw_params(ff, substream); - if (err < 0) { - snd_ff_stream_lock_release(ff); - return err; - } + if (err < 0) + goto release_lock; err = ff->spec->protocol->get_clock(ff, &rate, &src); - if (err < 0) { - snd_ff_stream_lock_release(ff); - return err; - } + if (err < 0) + goto release_lock; if (src != SND_FF_CLOCK_SRC_INTERNAL) { for (i = 0; i < CIP_SFC_COUNT; ++i) { @@ -159,8 +155,8 @@ static int pcm_open(struct snd_pcm_substream *substream) * streaming engine can't support. */ if (i >= CIP_SFC_COUNT) { - snd_ff_stream_lock_release(ff); - return -EIO; + err = -EIO; + goto release_lock; } substream->runtime->hw.rate_min = rate; @@ -177,6 +173,10 @@ static int pcm_open(struct snd_pcm_substream *substream) snd_pcm_set_sync(substream); return 0; + +release_lock: + snd_ff_stream_lock_release(ff); + return err; } static int pcm_close(struct snd_pcm_substream *substream)