]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ASoC: rsnd: tidyup loop on rsnd_adg_clk_query()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 24 May 2021 06:12:09 +0000 (15:12 +0900)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 13 Aug 2021 07:46:07 +0000 (09:46 +0200)
BugLink: https://bugs.launchpad.net/bugs/1938199
[ Upstream commit cf9d5c6619fadfc41cf8f5154cb990cc38e3da85 ]

commit 06e8f5c842f2d ("ASoC: rsnd: don't call clk_get_rate() under
atomic context") used saved clk_rate, thus for_each_rsnd_clk()
is no longer needed. This patch fixes it.

Fixes: 06e8f5c842f2d ("ASoC: rsnd: don't call clk_get_rate() under atomic context")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87v978oe2u.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
sound/soc/sh/rcar/adg.c

index b9aacf3d3b29c9b0de99830a568371edbffffbe8..7532ab27a48dfe7506833142b2040546b0cc3395 100644 (file)
@@ -289,7 +289,6 @@ static void rsnd_adg_set_ssi_clk(struct rsnd_mod *ssi_mod, u32 val)
 int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate)
 {
        struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
-       struct clk *clk;
        int i;
        int sel_table[] = {
                [CLKA] = 0x1,
@@ -302,10 +301,9 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate)
         * find suitable clock from
         * AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC/AUDIO_CLKI.
         */
-       for_each_rsnd_clk(clk, adg, i) {
+       for (i = 0; i < CLKMAX; i++)
                if (rate == adg->clk_rate[i])
                        return sel_table[i];
-       }
 
        /*
         * find divided clock from BRGA/BRGB