From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750986AbdKSOJh (ORCPT ); Sun, 19 Nov 2017 09:09:37 -0500 Received: from mout.web.de ([212.227.15.4]:56700 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750765AbdKSOJg (ORCPT ); Sun, 19 Nov 2017 09:09:36 -0500 To: alsa-devel@alsa-project.org, Jaroslav Kysela , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Sangbeom Kim , Sylwester Nawrocki , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] ASoC: bells: Use common error handling code in bells_set_bias_level_post() Message-ID: <8c4e72ae-7606-a4c8-3d53-42364d7edbb2@users.sourceforge.net> Date: Sun, 19 Nov 2017 15:08:39 +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:oUEeFhX/QBRWU1k7w3iLff41AKLyWnanBtmgclwPWJBHw0B2HQ/ 8ail3hZgSU92rn72EJovmtY0wy+IdUx721LnbUdoSrL4Lo2DdMcua5X11uoU++47vEuMdWO VoHxJAGsi4EG9nqD7VG/kjikGpym/ks0cfU7XWFFm+994e2mTBmgRDdKC5IKozsXEU2x4hL 33zWFBnj5hvJx0KHHQgqA== X-UI-Out-Filterresults: notjunk:1;V01:K0:iWdWeHt9U2M=:C3nFssIO+GdFvmnhUvKqo0 sCq9/SeQ5tZUZpNH5rEX/yvBOIXXRTpVV+K//+9cOQBUwJhsxn5/vpuEGtD8xBdiT41Z/NBzl NdehE8AgiYVNWiNWr7p8WwfXzTE9ftbEhL7JiqLBL6ZfIrJE5eq28JCJXeXbc4iMUTRldVeuH 9VI+btJSOO/Oi66+afMPCXWRndH+rlqirmCJ+EZO2Ox8Qb04g5Vt0mXrxRtIoMvmMGkKO8fhl 7uRfWd58jYcjRZlKrCkQgK/zZQMYJwqJzCstlnLs+uBBoUa/FJENsD7U/XAbACTIJJE3lq+nH GLMOMnpOeuYSpIiiXOL6GupMFb9TK1WutjyvO55ujA4fzMkZz0yz9cOupW5QOLYlNlmpZ6WLo TFWIvZpkqRO/kWvQdH3jQblYuDzUr7/oo5sGiX0AM/V5SVci0DIHiBcCSrtoCMD2wL+t4Z3q0 87rjOa1KTtGez9XE1JL0r9LHLTedBeMSz+zsrbEj8yFMV7VNdw9mROoAgqlAg/VNShSbFNDR9 bB45v937UdbQkJV8PdM81mBNxMYatambzhepWH6EJqipPsIZOA3iegocaXq7iYQ/H1jlG5D0z OUyz/oQ0LOnVbaE70Yr6gazdvv/cTxK51FGu2Lb8lVFTOJ5Uwq17k6Sdl97rESvvvwDkRuiqv /sASh1wWYEXYJ/+NBS7I+f4eSL/TeEB6W2fkWBR3ykLtjEV3AwtLa7OhEBsCqI1n7gi0jjypt ERjIXA6eXRSL8EP/ZE6M2MMf2r/0o4jE239AbVLCUbZz1S1nRqlmdrXclQKANXVJGDhpt4TQ3 CSiS3LTV8e+GwoTur3LkNBsvJuo9KLlpNHdEQoBUJewRENWVIg= 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 15:00:22 +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 macro "pr_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/soc/samsung/bells.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index 34deba461ae1..fc9a71523b3e 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -120,18 +120,14 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, switch (level) { case SND_SOC_BIAS_STANDBY: ret = snd_soc_codec_set_pll(codec, WM5102_FLL1, 0, 0, 0); - if (ret < 0) { - pr_err("Failed to stop FLL: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; if (bells->asyncclk_rate) { ret = snd_soc_codec_set_pll(codec, WM5102_FLL2, 0, 0, 0); - if (ret < 0) { - pr_err("Failed to stop FLL: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; } break; @@ -142,6 +138,10 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, dapm->bias_level = level; return 0; + +report_failure: + pr_err("Failed to stop FLL: %d\n", ret); + return ret; } static int bells_late_probe(struct snd_soc_card *card) -- 2.15.0