From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750951AbdKSJCp (ORCPT ); Sun, 19 Nov 2017 04:02:45 -0500 Received: from mout.web.de ([212.227.15.3]:60295 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750780AbdKSJCl (ORCPT ); Sun, 19 Nov 2017 04:02:41 -0500 To: alsa-devel@alsa-project.org, Andy Shevchenko , Jaroslav Kysela , Liam Girdwood , Mark Brown , Pierre-Louis Bossart , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] ASoC: cht_bsw_rt5645: Use common error handling code in cht_codec_fixup() Message-ID: <287c2ccc-2411-8a6d-bb1b-8b1062b92738@users.sourceforge.net> Date: Sun, 19 Nov 2017 10:00:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:XpVtDG8ycfVISb15QANPDPbvzmuMzoqbInDE8/vPa0SMwxnOPtE i9MnoDpBoFWmSp0HzZW3iaecR9cr0gHdwkUaBo13ND7QeS/DvwUd+sNWP2AgvfBLZ9h+DCi 0UZN/iUFQ7GBpkCZN51MPxDbKwFOs4qJfoZzU+9QUANAmXmEFubiaFFABYRfGjdbmoyzcqP ub2YhnxsOw11Z/ckYkofQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:9Jqteevmhd0=:gz/ty/+oKGWRAg9uThkOiZ PUWuJ74tXsNzEVrNrGeqIuQYL5EEvPVDAvfG3KmKoUk9YQ1n4eWLAByqNOgSbHOwk1chlhvJ3 AVCIFikA9C559I+AXVoX+3mzsCatEx2kmZrEiQCGlEbaqwxEGmYX92XoTt6Syb95Q6xHEMXGW O47yzuKAEK7Va0+Mkb2fhbp+heefRdYXwVpDWzNGhaj+n00tpc+vzw3NLtf0OpSDeF7/r1SOh /O4Zam0CeFyB4FoOs4pIOAYsemXCN3o6rAwgUbMLRPP2mt3TEim1FVEYN4BM4LL7ddIjMi3Jz SD8zz1doY5dsJYqN+gv6GyKLhoU/Np1YqtEojsmGnwsMa8HBesDiwD1t4zmKIWUyUOgYmhl7R 0T+jRMEpLziZNstPaSaj29O69ge/gLxJ2ZgEuszqf36EK3pXhDenxDnnRBVbaFqRhoWfTicUk Z0LX2MOQVcva2xHgmZWmaphqgCjUe0eWjeIsDWn6mdpf+BfEUJINU2Yvgrv2VUk8MfP1HulZ9 JPcXYt116FmNsEyzOlA600zlPg/FrGeAakiegodpVsPeJRdbCfaOtlns+63jpanpbwfvPsEPp yxOP9XJyvepKamSKrkZORlmLd7YeVEOeWwkeFg1V9/+tYAUzF3YmVXNxddy3Y4Cz9jJaQn4A1 O4OINeMjpSiYNpp2uyZxV75frvE5wizRcl+9+ub4NWmmCspWws0kyjfzsDA/cgDitemyrOQoU cJx858zP4U4khuk0LvGDbsPMfr8HkphF1T8TgQ+BY3+vsdR39ZsNWPq+Vm8npnt1MZeEOi5mc uPDxiQDEg2z7YBsAKeaLMyVhbxw6KdkPdbYSUCijcnJ4qRti3NIym3AW9DclmGEdExrkOBJ 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 09:53:56 +0100 * Add a jump target so that a specific error message is stored only once at the end of this function implementation. * Replace two calls of the function "dev_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/soc/intel/boards/cht_bsw_rt5645.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 18d129caa974..bf3ffc2b0d8f 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -357,20 +357,16 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS ); - if (ret < 0) { - dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; ret = snd_soc_dai_set_fmt(rtd->codec_dai, SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS ); - if (ret < 0) { - dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, 16); if (ret < 0) { @@ -403,6 +399,10 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, } } return 0; + +report_failure: + dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); + return ret; } static int cht_aif1_startup(struct snd_pcm_substream *substream) -- 2.15.0