From patchwork Sun Nov 19 12:43:26 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: 10065133 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 9FAAE6023A for ; Sun, 19 Nov 2017 12:47:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F9FC2924D for ; Sun, 19 Nov 2017 12:47:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8494B2926F; Sun, 19 Nov 2017 12:47:07 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 49EB62924D for ; Sun, 19 Nov 2017 12:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:To:From:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WSLJ999xB0EXqnzd4kaJ8u0TmN1+RBZR88/5BTcCDfM=; b=W3P0vdF8pgO6V5 WOnV81nwLwdP8P1YyaLd/6xzizlck6tidw7odGOQCNotz1jfBucuSqw+q7CT7C5wWMUVokpgXagIK fOqPbFDcrFpBeJZPaK3cNf7q/dl6+0bHQZdw8FOGsdi7r3XiTW5laaj0hKnHtQ+igNvPFA3+mrftb AVYqaQvPFaRu66buRpj/Visb88VCBMYAwIH0r08zQamIkOl0hRHRPQCuO5KUTix9X+n81rCKiNtJT 89QV60wr7OYhINuIaQ2fmLhK+tfJ0xApR+rLmkP/Ua1yJkHdkEhjFdpcZ9iJzg6Crb11l/d6/P7XA 4YwHOhY0QvGTEBqEAKAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eGP05-0007IC-C1; Sun, 19 Nov 2017 12:47:05 +0000 Received: from mout.web.de ([212.227.15.4]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eGOzi-0006vp-At; Sun, 19 Nov 2017 12:46:45 +0000 Received: from [192.168.1.3] ([92.225.173.18]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MYvmV-1ecYcm3nut-00VjJK; Sun, 19 Nov 2017 13:43:28 +0100 Subject: [PATCH 1/2] ASoC: rockchip: Use common error handling code in rk_aif1_hw_params() From: SF Markus Elfring To: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, =?UTF-8?Q?Heiko_St=c3=bcbner?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai References: <255fa488-a5f1-2ea3-dd48-b10ad8b2c18c@users.sourceforge.net> Message-ID: <72605b8c-a5dc-3cc6-8e9f-940c8e72581d@users.sourceforge.net> Date: Sun, 19 Nov 2017 13:43:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <255fa488-a5f1-2ea3-dd48-b10ad8b2c18c@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:LVngffGbC2ismMVQpUJYQtmY6vr7Lo5fLnUS3IecIUpy0q3ajZm mBGVPGsO9sMmAhm7wglvBnZ9fwcxACY7r/MIPV66gU4bLDiou4EQMfCYNKWQdpCgs2CCgVm 2aBJM6W1V4DCsBlTgrHPkNuMxmhFup5aC8hIP5HzxLId50KlgdIlqwjHLocKnizgtoigu6C zhSngBCBK9eC/cUT5Wymw== X-UI-Out-Filterresults: notjunk:1; V01:K0:C1MZKkImaiA=:ldHwUEOAtwiv2fTn0KG3i/ TgpFkuQL/nkhJau3VjcZ/HSG+q5eWJj4Q7J9lsVMvThhzoPQSRxIikb7NZAf7XGXnTDNJKvCi AZIBmXthXcugH/x16IhUmK9X4l76up9N0G2q4/ql3WNB4ErKmtL/si+03fNr26aRB/luTdrgm O7o8uuB+EUYe81zdfqw3g/8+4PBIalO9LwHYhKvxqejZHtEww00hpjHbSS7SqOkcunx0JjGiG 8bXQvd2uf//0mdeWg9emBRmX8+QKrx76M73EQM8ZroxIuWyVaaVn0OwBjB3s4IyHKjD5O39D6 1mc4x1i/UnDIO600rCCrtpz8xzYfeIoawxDgoLt0D5SMZp2/jlK3wnE7GeuGB0hkd4E1patxj 3g5XlaJJguDhdJlgjVtvKtqI3j1bznFqsEKk+A9Khdzd+tQfIgp4W4j7NwSX/KfU0ozPdkc7/ q/EaUe91qLSPYRz1CvsolyrevJnprQQTwR8h0qzR1neHsTYNcuadphSSBvH8C1bVr717XbQQm flpkYpEKoqrJ2xzbYaD7LLV1UzNwiHrI41Ls+5h+J8LgINdAd0DUhRcSgkT0arsPhUhucv16W h1SzWsf/fVy5BNQCHzoXKw6ZvMo7mTN/bz5C+rqUACTeGBwdk9omDnRC3Ds7o2T+NHiXzCEoF gZwUBkuOmgltVqVjLT43uyzmzDdd0BAFx18ocY2BnTQQPI50WQ4vpEkKliAQ/VP6c7Cba0x9n 1AfYlNMUh3M32tQn0fRoaUvutEXQBJU1G5z3wzIVjrwydEyM7n6F9D5+iQ9PFW0ex2zONGh/X r00IebL+q1Po5U6PCZAkgcBYC0h5fv7M4iZpMshMnlC0/VLnpE= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171119_044642_904848_5AA98BDD X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 19 Nov 2017 13:23:35 +0100 Add a jump target so that a bit of exception handling can be better reused in an if branch of these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/soc/rockchip/rockchip_max98090.c | 11 ++++------- sound/soc/rockchip/rockchip_rt5645.c | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 789d6f1e2b5f..419fa6ef14bb 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -104,17 +104,14 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, SND_SOC_CLOCK_OUT); - if (ret < 0) { - dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, SND_SOC_CLOCK_IN); - if (ret < 0) { + if (ret < 0) +report_failure: dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret); - return ret; - } return ret; } diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c index 9e0c17805807..7f763d0963d3 100644 --- a/sound/soc/rockchip/rockchip_rt5645.c +++ b/sound/soc/rockchip/rockchip_rt5645.c @@ -98,17 +98,14 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, SND_SOC_CLOCK_OUT); - if (ret < 0) { - dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, SND_SOC_CLOCK_IN); - if (ret < 0) { + if (ret < 0) +report_failure: dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret); - return ret; - } return ret; }