lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 413/862] ASoC: rockchip: i2s: use regmap_read_poll_timeout_atomic to poll I2S_CLR
    Date
    From: Judy Hsiao <judyhsiao@chromium.org>

    [ Upstream commit f0c8d7468af0001b80b0c86802ee28063f800987 ]

    1. Uses regmap_read_poll_timeout_atomic to poll I2S_CLR as it is called
    within a spin lock.

    2. Fixes the typo of break condition in regmap_read_poll_timeout_atomic.

    Fixes: fbb0ec656ee5 ("ASoC: rockchip: i2s: use regmap_read_poll_timeout to poll I2S_CLR")
    Signed-off-by: Judy Hsiao <judyhsiao@chromium.org>
    Link: https://lore.kernel.org/r/20220930151546.2017667-1-judyhsiao@chromium.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/rockchip/rockchip_i2s.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
    index 28c86f5e435e..a8758ad68442 100644
    --- a/sound/soc/rockchip/rockchip_i2s.c
    +++ b/sound/soc/rockchip/rockchip_i2s.c
    @@ -162,12 +162,12 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
    I2S_CLR_TXC | I2S_CLR_RXC);
    if (ret < 0)
    goto end;
    - ret = regmap_read_poll_timeout(i2s->regmap,
    - I2S_CLR,
    - val,
    - val != 0,
    - 20,
    - 200);
    + ret = regmap_read_poll_timeout_atomic(i2s->regmap,
    + I2S_CLR,
    + val,
    + val == 0,
    + 20,
    + 200);
    if (ret < 0)
    dev_warn(i2s->dev, "fail to clear: %d\n", ret);
    }
    @@ -220,12 +220,12 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)
    I2S_CLR_TXC | I2S_CLR_RXC);
    if (ret < 0)
    goto end;
    - ret = regmap_read_poll_timeout(i2s->regmap,
    - I2S_CLR,
    - val,
    - val != 0,
    - 20,
    - 200);
    + ret = regmap_read_poll_timeout_atomic(i2s->regmap,
    + I2S_CLR,
    + val,
    + val == 0,
    + 20,
    + 200);
    if (ret < 0)
    dev_warn(i2s->dev, "fail to clear: %d\n", ret);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 12:43    [W:4.020 / U:1.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site