From patchwork Wed Apr 19 17:04:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9688279 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 A303A602DC for ; Wed, 19 Apr 2017 17:05:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EAFD2842B for ; Wed, 19 Apr 2017 17:05:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8141F28433; Wed, 19 Apr 2017 17:05:01 +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 6F6012842B for ; Wed, 19 Apr 2017 17:04:59 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 59889266B38; Wed, 19 Apr 2017 19:04:56 +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 7F381266ED5; Wed, 19 Apr 2017 19:04:55 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by alsa0.perex.cz (Postfix) with ESMTP id D20A3266B23 for ; Wed, 19 Apr 2017 19:04:51 +0200 (CEST) Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M0ACi-1cB7I221O8-00uJ6E; Wed, 19 Apr 2017 19:04:46 +0200 From: Arnd Bergmann To: Liam Girdwood , Mark Brown Date: Wed, 19 Apr 2017 19:04:20 +0200 Message-Id: <20170419170449.2965453-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:A1xnR3khjtRZblSUFhkeugrb8QEI+ItppcZvZcN3ijBeZQ29U6C Uv2/YnGB9PMVfDeHpl0nG0CGFGyZCJB8ZTigy4uovP1fN464gydlnXh8nV8KF4fn0jxWhVs d9jm5ReBkmc1p5qwjoL2nB9YhnWFkqcuNloH11nw488YkNNEjUxuIids2FC7P/c0eB3ZCxT HQMtj2NppKuTp7mp1LRSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:0YUuX3YcXO8=:UeQhr0NQR0+HsvQY+nx0Bl KFw2rLu8IbhSUpNOMONEZpkWIrrja1rOaf+AbADWlyerTAC+vT+rJQVHXg3HMfWzCzzY46TtM XQBiVPHB8Q7WL4Ts/FAgMFIk7/U48YLRiNNbx/cPlyNL76TDDgUvor+7/xQ+urxDYC+7yw6iV Onq8fRoqcUcDWu7l3kGpVk3cKfP3aSM3k0lmAdIzBwqpXs6tlRMEq+4i0tP86DXXfA5x8eGP6 63rBZNIq6kn/0VQymENVGf7NkY4F+jFSA83GJ73ofmBysXhgv5+VbF1zJln15GcJoJDSF+L4G UWKTZwHwYC+1s1gbWwlKcvEfBEtvg3us85HUR6q0tdtDAXndDLelXXbKc33kZ17gNjyk4f/gu cC9Ie7Hw036HC1mcGItRhTF5IT+HtGUODqp1KNtXk0MqGChgCoxgk3rJPPmFv3J3JWbvlEVl4 h9HOqHIjfn+sCJ8JlffMJ45AxTxHMbozWhTakma6EZYhGDhRkCiLWilmt/d/BnHSttRzTtaBH f29hE/DTp1jlw+c2G/BI1JDf7v1bAjgNTMqhFoQgFUfKwEHG7MnYz9xI3eUNgv7IZlSngU/oq 7/fRu07qh02wxXWjl7koRhzcPtt0rn7lfLx3NpvvvbTUGtCtSri+6BbPKcGQ5EfIIS+H4Wtpu nFCmdj/xHstbPsbJMGBqHzqSk4eycAHthitfgC2DTul0c0uDbYiTnVkQF1yp++/QgW1A= Cc: alsa-devel@alsa-project.org, Arnd Bergmann , patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, Charles Keepax , Daniel Baluta Subject: [alsa-devel] [PATCH] ASoC: codec: wm9860: avoid maybe-uninitialized warning 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The new PLL configuration code triggers a harmless warning: sound/soc/codecs/wm8960.c: In function 'wm8960_configure_clocking': sound/soc/codecs/wm8960.c:735:3: error: 'best_freq_out' may be used uninitialized in this function [-Werror=maybe-uninitialized] wm8960_set_pll(codec, freq_in, best_freq_out); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/codecs/wm8960.c:699:12: note: 'best_freq_out' was declared here I think the warning was introduced by Daniel's bugfix. I've come up with a way to simplify the code in a way that is more readable to both humans and to gcc, which gets us rid of the warning. Fixes: 84fdc00d519f ("ASoC: codec: wm9860: Refactor PLL out freq search") Fixes: 303e8954af8d ("ASoC: codec: wm8960: Stop when a matching PLL freq is found") Signed-off-by: Arnd Bergmann Acked-by: Charles Keepax --- sound/soc/codecs/wm8960.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index ace69da97cb8..ba0f80504c6b 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -696,14 +696,12 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, { struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); int sysclk, bclk, lrclk, freq_out; - int diff, best_freq_out; + int diff; int i, j, k; bclk = wm8960->bclk; lrclk = wm8960->lrclk; - *bclk_idx = -1; - for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) { if (sysclk_divs[i] == -1) continue; @@ -720,22 +718,14 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, *sysclk_idx = i; *dac_idx = j; *bclk_idx = k; - best_freq_out = freq_out; - break; + return freq_out; } } - if (k != ARRAY_SIZE(bclk_divs)) - break; } - if (j != ARRAY_SIZE(dac_divs)) - break; } - - if (*bclk_idx != -1) - wm8960_set_pll(codec, freq_in, best_freq_out); - - return *bclk_idx; + return -EINVAL; } + static int wm8960_configure_clocking(struct snd_soc_codec *codec) { struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); @@ -783,11 +773,12 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec) } } - ret = wm8960_configure_pll(codec, freq_in, &i, &j, &k); - if (ret < 0) { + freq_out = wm8960_configure_pll(codec, freq_in, &i, &j, &k); + if (freq_out < 0) { dev_err(codec->dev, "failed to configure clock via PLL\n"); - return -EINVAL; + return freq_out; } + wm8960_set_pll(codec, freq_in, freq_out); configure_clock: /* configure sysclk clock */