OSDN Git Service

wl12xx: scan: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
authorMinghao Chi <chi.minghao@zte.com.cn>
Wed, 20 Apr 2022 09:02:47 +0000 (09:02 +0000)
committerKalle Valo <kvalo@kernel.org>
Sat, 23 Apr 2022 12:46:13 +0000 (15:46 +0300)
Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
pm_runtime_put_noidle. This change is just to simplify the code, no
actual functional changes.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220420090247.2588680-1-chi.minghao@zte.com.cn
drivers/net/wireless/ti/wlcore/scan.c

index 29fa51c..b414305 100644 (file)
@@ -53,11 +53,9 @@ void wl1271_scan_complete_work(struct work_struct *work)
        wl->scan.req = NULL;
        wl->scan_wlvif = NULL;
 
-       ret = pm_runtime_get_sync(wl->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(wl->dev);
+       ret = pm_runtime_resume_and_get(wl->dev);
+       if (ret < 0)
                goto out;
-       }
 
        if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
                /* restore hardware connection monitoring template */