lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 285/348] ASoC: rsnd: tidyup loop on rsnd_adg_clk_query()
    Date
    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    [ 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>
    ---
    sound/soc/sh/rcar/adg.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
    index b9aacf3d3b29..7532ab27a48d 100644
    --- a/sound/soc/sh/rcar/adg.c
    +++ b/sound/soc/sh/rcar/adg.c
    @@ -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
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 08:40    [W:4.095 / U:1.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site