ASoC: rockchip: i2s: use regmap_read_poll_timeout_atomic to poll I2S_CLR
authorJudy Hsiao <judyhsiao@chromium.org>
Fri, 30 Sep 2022 15:15:46 +0000 (15:15 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 30 Sep 2022 16:12:27 +0000 (17:12 +0100)
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>
sound/soc/rockchip/rockchip_i2s.c

index 28c86f5e435e4e83e2f3cdbf585e171ed69dd426..a8758ad68442daba7bdbe22dce06851e0c6fa96f 100644 (file)
@@ -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);
                }