From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751074AbdKSMqx (ORCPT ); Sun, 19 Nov 2017 07:46:53 -0500 Received: from mout.web.de ([212.227.15.4]:54302 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751010AbdKSMqu (ORCPT ); Sun, 19 Nov 2017 07:46:50 -0500 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 Cc: LKML , kernel-janitors@vger.kernel.org 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-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit 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= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; } -- 2.15.0