net: wireless: Remove redundant pm_runtime_mark_last_busy() calls

pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(),
pm_runtime_autosuspend() and pm_request_autosuspend() now include a call
to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to
pm_runtime_mark_last_busy().

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Link: https://patch.msgid.link/20251027115022.390997-3-sakari.ailus@linux.intel.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c
index f521af575e9ba1250db39457aaf8b7d8c253bfd4..c866cfd144c76c73a95881a1b74be64fa4d195dd 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/pm.c
+++ b/drivers/net/wireless/ath/wil6210/pm.c
@@ -458,6 +458,5 @@ void wil_pm_runtime_put(struct wil6210_priv *wil)
 {
        struct device *dev = wil_to_dev(wil);
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 }

diff --git a/drivers/net/wireless/ti/wl18xx/debugfs.c b/drivers/net/wireless/ti/wl18xx/debugfs.c
index 80fbf740fe6d7bc78235313163ae0d971b3cfe82..ac756318e8ea5bec429a1255e848c5872211e1ac 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/debugfs.c
+++ b/drivers/net/wireless/ti/wl18xx/debugfs.c
@@ -272,7 +272,6 @@ static ssize_t radar_detection_write(struct file *file,
        if (ret < 0)
                count = ret;
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -312,7 +311,6 @@ static ssize_t dynamic_fw_traces_write(struct file *file,
        if (ret < 0)
                count = ret;
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -374,7 +372,6 @@ static ssize_t radar_debug_mode_write(struct file *file,
                                       wl->radar_debug_mode, 0);
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);

diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index fa3a3f71dd156271b29227ff2f5227a837f8169d..9d73ba933a16c1445e1dc38134eca5b38a98a226 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -213,7 +213,6 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
        } while (!event);
 
 out:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 free_vector:
        kfree(events_vector);

diff --git a/drivers/net/wireless/ti/wlcore/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
index eb3d3f0e0b4df51577504542dc755a4832a4696a..bbfd2725215b4b3b605569285fb49abf2d1217b2 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
@@ -63,7 +63,6 @@ void wl1271_debugfs_update_stats(struct wl1271 *wl)
                wl->stats.fw_stats_update = jiffies;
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -113,7 +112,6 @@ static void chip_op_handler(struct wl1271 *wl, unsigned long value,
        chip_op = arg;
        chip_op(wl);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 }
 
@@ -287,7 +285,6 @@ static ssize_t dynamic_ps_timeout_write(struct file *file,
                        wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE);
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -357,7 +354,6 @@ static ssize_t forced_ps_write(struct file *file,
                        wl1271_ps_set_mode(wl, wlvif, ps_mode);
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -830,7 +826,6 @@ static ssize_t rx_streaming_interval_write(struct file *file,
                wl1271_recalc_rx_streaming(wl, wlvif);
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -886,7 +881,6 @@ static ssize_t rx_streaming_always_write(struct file *file,
                wl1271_recalc_rx_streaming(wl, wlvif);
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -934,7 +928,6 @@ static ssize_t beacon_filtering_write(struct file *file,
                ret = wl1271_acx_beacon_filter_opt(wl, wlvif, !!value);
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -1015,7 +1008,6 @@ static ssize_t sleep_auth_write(struct file *file,
                goto out_sleep;
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -1090,7 +1082,6 @@ read_err:
                goto part_err;
 
 part_err:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 skip_read:
@@ -1172,7 +1163,6 @@ write_err:
                goto part_err;
 
 part_err:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 skip_write:
@@ -1247,7 +1237,6 @@ static ssize_t fw_logger_write(struct file *file,
 
        ret = wl12xx_cmd_config_fwlog(wl);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 6116a8522d960a29932cb2454c1d639c887baea9..12f0167d7380eed95bd2584ad8d4e9f8c7c36437 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -154,7 +154,6 @@ static void wl1271_rx_streaming_enable_work(struct work_struct *work)
                  jiffies + msecs_to_jiffies(wl->conf.rx_streaming.duration));
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -181,7 +180,6 @@ static void wl1271_rx_streaming_disable_work(struct work_struct *work)
                goto out_sleep;
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -234,7 +232,6 @@ static void wlcore_rc_update_work(struct work_struct *work)
        }
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -711,7 +708,6 @@ static int wlcore_irq_locked(struct wl1271 *wl)
        }
 
 err_ret:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -1047,7 +1043,6 @@ static void wl1271_recovery_work(struct work_struct *work)
        }
 
        wlcore_op_stop_locked(wl);
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
        ieee80211_restart_hw(wl->hw);
@@ -1943,7 +1938,6 @@ static int __maybe_unused wl1271_op_resume(struct ieee80211_hw *hw)
                goto out_sleep;
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -2131,7 +2125,6 @@ static void wlcore_channel_switch_work(struct work_struct *work)
 
        wl12xx_cmd_stop_channel_switch(wl, wlvif);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -2201,7 +2194,6 @@ static void wlcore_pending_auth_complete_work(struct work_struct *work)
        /* cancel the ROC if active */
        wlcore_update_inconn_sta(wl, wlvif, NULL, false);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -2694,7 +2686,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
        else
                wl->sta_count++;
 out:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out_unlock:
        mutex_unlock(&wl->mutex);
@@ -2774,7 +2765,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
                        }
                }
 
-               pm_runtime_mark_last_busy(wl->dev);
                pm_runtime_put_autosuspend(wl->dev);
        }
 deinit:
@@ -3200,7 +3190,6 @@ static int wl1271_op_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)
        }
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -3315,7 +3304,6 @@ static void wl1271_op_configure_filter(struct ieee80211_hw *hw,
         */
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -3531,7 +3519,6 @@ static int wlcore_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
        ret = wlcore_hw_set_key(wl, cmd, vif, sta, key_conf);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out_wake_queues:
@@ -3695,7 +3682,6 @@ static void wl1271_op_set_default_key_idx(struct ieee80211_hw *hw,
        }
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out_unlock:
@@ -3724,7 +3710,6 @@ void wlcore_regdomain_config(struct wl1271 *wl)
                goto out;
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -3772,7 +3757,6 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
 
        ret = wlcore_scan(hw->priv, vif, ssid, len, req);
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -3823,7 +3807,6 @@ static void wl1271_op_cancel_hw_scan(struct ieee80211_hw *hw,
        ieee80211_scan_completed(wl->hw, &info);
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -3860,7 +3843,6 @@ static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw,
        wl->sched_vif = wlvif;
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -3887,7 +3869,6 @@ static int wl1271_op_sched_scan_stop(struct ieee80211_hw *hw,
 
        wl->ops->sched_scan_stop(wl, wlvif);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -3916,7 +3897,6 @@ static int wl1271_op_set_frag_threshold(struct ieee80211_hw *hw,
        if (ret < 0)
                wl1271_warning("wl1271_op_set_frag_threshold failed: %d", ret);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -3948,7 +3928,6 @@ static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,
                if (ret < 0)
                        wl1271_warning("set rts threshold failed: %d", ret);
        }
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -4714,7 +4693,6 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
        else
                wl1271_bss_info_changed_sta(wl, vif, bss_conf, changed);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -4779,7 +4757,6 @@ static void wlcore_op_change_chanctx(struct ieee80211_hw *hw,
                }
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -4828,7 +4805,6 @@ static int wlcore_op_assign_vif_chanctx(struct ieee80211_hw *hw,
                wlvif->radar_enabled = true;
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -4871,7 +4847,6 @@ static void wlcore_op_unassign_vif_chanctx(struct ieee80211_hw *hw,
                wlvif->radar_enabled = false;
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -4941,7 +4916,6 @@ wlcore_op_switch_vif_chanctx(struct ieee80211_hw *hw,
                        goto out_sleep;
        }
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -4995,7 +4969,6 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw,
                                 0, 0);
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -5029,7 +5002,6 @@ static u64 wl1271_op_get_tsf(struct ieee80211_hw *hw,
                goto out_sleep;
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -5342,7 +5314,6 @@ static int wl12xx_op_sta_state(struct ieee80211_hw *hw,
 
        ret = wl12xx_update_sta_state(wl, wlvif, sta, old_state, new_state);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -5467,7 +5438,6 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
                ret = -EINVAL;
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -5511,7 +5481,6 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw,
                        wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
                ret = wl1271_acx_sta_rate_policies(wl, wlvif);
 
-               pm_runtime_mark_last_busy(wl->dev);
                pm_runtime_put_autosuspend(wl->dev);
        }
 out:
@@ -5566,7 +5535,6 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw,
        }
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:
@@ -5645,7 +5613,6 @@ static void wlcore_op_channel_switch_beacon(struct ieee80211_hw *hw,
        set_bit(WLVIF_FLAG_CS_PROGRESS, &wlvif->flags);
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -5699,7 +5666,6 @@ static int wlcore_op_remain_on_channel(struct ieee80211_hw *hw,
        ieee80211_queue_delayed_work(hw, &wl->roc_complete_work,
                                     msecs_to_jiffies(duration));
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -5748,7 +5714,6 @@ static int wlcore_roc_completed(struct wl1271 *wl)
 
        ret = __wlcore_roc_completed(wl);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -5839,7 +5804,6 @@ static void wlcore_op_sta_statistics(struct ieee80211_hw *hw,
        sinfo->signal = rssi_dbm;
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
 out:

diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index b414305acc32261c4b6bcd74f47be73f65d6e25f..f6dc54c1dbaded27b5b39137985a55fa4ffa1709 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -69,7 +69,6 @@ void wl1271_scan_complete_work(struct work_struct *work)
 
        wlcore_cmd_regdomain_config_locked(wl);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
        ieee80211_scan_completed(wl->hw, &info);

diff --git a/drivers/net/wireless/ti/wlcore/sysfs.c b/drivers/net/wireless/ti/wlcore/sysfs.c
index 65ca5dc569a0471a8042c069eb9da81614e708b0..5ab6c168367563cbbe85a25234adc218397a8448 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/sysfs.c
+++ b/drivers/net/wireless/ti/wlcore/sysfs.c
@@ -58,7 +58,6 @@ static ssize_t bt_coex_state_store(struct device *dev,
                goto out;
 
        wl1271_acx_sg_enable(wl, wl->sg_enabled);
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 
  out:

diff --git a/drivers/net/wireless/ti/wlcore/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c
index fc8ea58bc16597d84c305f913774f2761d112b4c..7c0cb1b7fef0b93b101c0bf728c27c7b2b2a2f29 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/testmode.c
+++ b/drivers/net/wireless/ti/wlcore/testmode.c
@@ -127,7 +127,6 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
        }
 
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -192,7 +191,6 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
 out_free:
        kfree(cmd);
 out_sleep:
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);

diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 464587d16ab20dd03de87f8214eb9f99652aa957..f76087be2f758ea83320bb643272f4bd852f2ad2 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -863,7 +863,6 @@ void wl1271_tx_work(struct work_struct *work)
                goto out;
        }
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);

diff --git a/drivers/net/wireless/ti/wlcore/vendor_cmd.c b/drivers/net/wireless/ti/wlcore/vendor_cmd.c
index e4269e2b00981e15d02a9563b1f07b482fcf5bd7..5bb9eb300f97907fdf956e32faee875a5abfeadf 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/vendor_cmd.c
+++ b/drivers/net/wireless/ti/wlcore/vendor_cmd.c
@@ -60,7 +60,6 @@ wlcore_vendor_cmd_smart_config_start(struct wiphy *wiphy,
        ret = wlcore_smart_config_start(wl,
                        nla_get_u32(tb[WLCORE_VENDOR_ATTR_GROUP_ID]));
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -92,7 +91,6 @@ wlcore_vendor_cmd_smart_config_stop(struct wiphy *wiphy,
 
        ret = wlcore_smart_config_stop(wl);
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);
@@ -140,7 +138,6 @@ wlcore_vendor_cmd_smart_config_set_group_key(struct wiphy *wiphy,
                        nla_len(tb[WLCORE_VENDOR_ATTR_GROUP_KEY]),
                        nla_data(tb[WLCORE_VENDOR_ATTR_GROUP_KEY]));
 
-       pm_runtime_mark_last_busy(wl->dev);
        pm_runtime_put_autosuspend(wl->dev);
 out:
        mutex_unlock(&wl->mutex);