rtw88: use read_poll_timeout_atomic() for poll loop

This gives the added bonus of not wasting an extra udelay() if we're
timing out -- we double-check the register state one last time before
returning.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200821235733.1785009-1-briannorris@chromium.org

diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c
index 19b9b7ab016b37eee159cb97961820704d1c1fb5..59028b121b00e17f277038540a41910b3a04780f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/mac.c
+++ b/drivers/net/wireless/realtek/rtw88/mac.c
@@ -114,18 +114,13 @@ static int rtw_mac_pre_system_cfg(struct rtw_dev *rtwdev)
 
 static bool do_pwr_poll_cmd(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 target)
 {
-       u32 cnt;
+       u32 val;
 
        target &= mask;
 
-       for (cnt = 0; cnt < RTW_PWR_POLLING_CNT; cnt++) {
-               if ((rtw_read8(rtwdev, addr) & mask) == target)
-                       return true;
-
-               udelay(50);
-       }
-
-       return false;
+       return read_poll_timeout_atomic(rtw_read8, val, (val & mask) == target,
+                                       50, 50 * RTW_PWR_POLLING_CNT, false,
+                                       rtwdev, addr) == 0;
 }
 
 static int rtw_pwr_cmd_polling(struct rtw_dev *rtwdev,