]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wl18xx: debugfs: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
authorMinghao Chi <chi.minghao@zte.com.cn>
Wed, 13 Apr 2022 09:33:56 +0000 (09:33 +0000)
committerKalle Valo <kvalo@kernel.org>
Sat, 23 Apr 2022 12:43:27 +0000 (15:43 +0300)
Using pm_runtime_resume_and_get is more appropriate
for simplifing code

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/20220413093356.2538192-1-chi.minghao@zte.com.cn
drivers/net/wireless/ti/wl18xx/debugfs.c

index 2f921a44f1e2f90595cf914b6767936be0ea8d24..80fbf740fe6d7bc78235313163ae0d971b3cfe82 100644 (file)
@@ -264,11 +264,9 @@ static ssize_t radar_detection_write(struct file *file,
        if (unlikely(wl->state != WLCORE_STATE_ON))
                goto out;
 
-       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;
-       }
 
        ret = wl18xx_cmd_radar_detection_debug(wl, channel);
        if (ret < 0)
@@ -306,11 +304,9 @@ static ssize_t dynamic_fw_traces_write(struct file *file,
        if (unlikely(wl->state != WLCORE_STATE_ON))
                goto out;
 
-       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;
-       }
 
        ret = wl18xx_acx_dynamic_fw_traces(wl);
        if (ret < 0)
@@ -368,11 +364,9 @@ static ssize_t radar_debug_mode_write(struct file *file,
        if (unlikely(wl->state != WLCORE_STATE_ON))
                goto out;
 
-       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;
-       }
 
        wl12xx_for_each_wlvif_ap(wl, wlvif) {
                wlcore_cmd_generic_cfg(wl, wlvif,