Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Sakari Ailus and committed by
Johannes Berg
0a119c68 88de0834

-60
-1
drivers/net/wireless/ath/wil6210/pm.c
··· 458 458 { 459 459 struct device *dev = wil_to_dev(wil); 460 460 461 - pm_runtime_mark_last_busy(dev); 462 461 pm_runtime_put_autosuspend(dev); 463 462 }
-3
drivers/net/wireless/ti/wl18xx/debugfs.c
··· 272 272 if (ret < 0) 273 273 count = ret; 274 274 275 - pm_runtime_mark_last_busy(wl->dev); 276 275 pm_runtime_put_autosuspend(wl->dev); 277 276 out: 278 277 mutex_unlock(&wl->mutex); ··· 311 312 if (ret < 0) 312 313 count = ret; 313 314 314 - pm_runtime_mark_last_busy(wl->dev); 315 315 pm_runtime_put_autosuspend(wl->dev); 316 316 out: 317 317 mutex_unlock(&wl->mutex); ··· 372 374 wl->radar_debug_mode, 0); 373 375 } 374 376 375 - pm_runtime_mark_last_busy(wl->dev); 376 377 pm_runtime_put_autosuspend(wl->dev); 377 378 out: 378 379 mutex_unlock(&wl->mutex);
-1
drivers/net/wireless/ti/wlcore/cmd.c
··· 213 213 } while (!event); 214 214 215 215 out: 216 - pm_runtime_mark_last_busy(wl->dev); 217 216 pm_runtime_put_autosuspend(wl->dev); 218 217 free_vector: 219 218 kfree(events_vector);
-11
drivers/net/wireless/ti/wlcore/debugfs.c
··· 63 63 wl->stats.fw_stats_update = jiffies; 64 64 } 65 65 66 - pm_runtime_mark_last_busy(wl->dev); 67 66 pm_runtime_put_autosuspend(wl->dev); 68 67 69 68 out: ··· 112 113 chip_op = arg; 113 114 chip_op(wl); 114 115 115 - pm_runtime_mark_last_busy(wl->dev); 116 116 pm_runtime_put_autosuspend(wl->dev); 117 117 } 118 118 ··· 285 287 wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE); 286 288 } 287 289 288 - pm_runtime_mark_last_busy(wl->dev); 289 290 pm_runtime_put_autosuspend(wl->dev); 290 291 291 292 out: ··· 354 357 wl1271_ps_set_mode(wl, wlvif, ps_mode); 355 358 } 356 359 357 - pm_runtime_mark_last_busy(wl->dev); 358 360 pm_runtime_put_autosuspend(wl->dev); 359 361 360 362 out: ··· 826 830 wl1271_recalc_rx_streaming(wl, wlvif); 827 831 } 828 832 829 - pm_runtime_mark_last_busy(wl->dev); 830 833 pm_runtime_put_autosuspend(wl->dev); 831 834 out: 832 835 mutex_unlock(&wl->mutex); ··· 881 886 wl1271_recalc_rx_streaming(wl, wlvif); 882 887 } 883 888 884 - pm_runtime_mark_last_busy(wl->dev); 885 889 pm_runtime_put_autosuspend(wl->dev); 886 890 out: 887 891 mutex_unlock(&wl->mutex); ··· 928 934 ret = wl1271_acx_beacon_filter_opt(wl, wlvif, !!value); 929 935 } 930 936 931 - pm_runtime_mark_last_busy(wl->dev); 932 937 pm_runtime_put_autosuspend(wl->dev); 933 938 out: 934 939 mutex_unlock(&wl->mutex); ··· 1008 1015 goto out_sleep; 1009 1016 1010 1017 out_sleep: 1011 - pm_runtime_mark_last_busy(wl->dev); 1012 1018 pm_runtime_put_autosuspend(wl->dev); 1013 1019 out: 1014 1020 mutex_unlock(&wl->mutex); ··· 1082 1090 goto part_err; 1083 1091 1084 1092 part_err: 1085 - pm_runtime_mark_last_busy(wl->dev); 1086 1093 pm_runtime_put_autosuspend(wl->dev); 1087 1094 1088 1095 skip_read: ··· 1163 1172 goto part_err; 1164 1173 1165 1174 part_err: 1166 - pm_runtime_mark_last_busy(wl->dev); 1167 1175 pm_runtime_put_autosuspend(wl->dev); 1168 1176 1169 1177 skip_write: ··· 1237 1247 1238 1248 ret = wl12xx_cmd_config_fwlog(wl); 1239 1249 1240 - pm_runtime_mark_last_busy(wl->dev); 1241 1250 pm_runtime_put_autosuspend(wl->dev); 1242 1251 1243 1252 out:
-36
drivers/net/wireless/ti/wlcore/main.c
··· 154 154 jiffies + msecs_to_jiffies(wl->conf.rx_streaming.duration)); 155 155 156 156 out_sleep: 157 - pm_runtime_mark_last_busy(wl->dev); 158 157 pm_runtime_put_autosuspend(wl->dev); 159 158 out: 160 159 mutex_unlock(&wl->mutex); ··· 180 181 goto out_sleep; 181 182 182 183 out_sleep: 183 - pm_runtime_mark_last_busy(wl->dev); 184 184 pm_runtime_put_autosuspend(wl->dev); 185 185 out: 186 186 mutex_unlock(&wl->mutex); ··· 232 234 } 233 235 234 236 out_sleep: 235 - pm_runtime_mark_last_busy(wl->dev); 236 237 pm_runtime_put_autosuspend(wl->dev); 237 238 out: 238 239 mutex_unlock(&wl->mutex); ··· 708 711 } 709 712 710 713 err_ret: 711 - pm_runtime_mark_last_busy(wl->dev); 712 714 pm_runtime_put_autosuspend(wl->dev); 713 715 714 716 out: ··· 1043 1047 } 1044 1048 1045 1049 wlcore_op_stop_locked(wl); 1046 - pm_runtime_mark_last_busy(wl->dev); 1047 1050 pm_runtime_put_autosuspend(wl->dev); 1048 1051 1049 1052 ieee80211_restart_hw(wl->hw); ··· 1938 1943 goto out_sleep; 1939 1944 1940 1945 out_sleep: 1941 - pm_runtime_mark_last_busy(wl->dev); 1942 1946 pm_runtime_put_autosuspend(wl->dev); 1943 1947 1944 1948 out: ··· 2125 2131 2126 2132 wl12xx_cmd_stop_channel_switch(wl, wlvif); 2127 2133 2128 - pm_runtime_mark_last_busy(wl->dev); 2129 2134 pm_runtime_put_autosuspend(wl->dev); 2130 2135 out: 2131 2136 mutex_unlock(&wl->mutex); ··· 2194 2201 /* cancel the ROC if active */ 2195 2202 wlcore_update_inconn_sta(wl, wlvif, NULL, false); 2196 2203 2197 - pm_runtime_mark_last_busy(wl->dev); 2198 2204 pm_runtime_put_autosuspend(wl->dev); 2199 2205 out: 2200 2206 mutex_unlock(&wl->mutex); ··· 2686 2694 else 2687 2695 wl->sta_count++; 2688 2696 out: 2689 - pm_runtime_mark_last_busy(wl->dev); 2690 2697 pm_runtime_put_autosuspend(wl->dev); 2691 2698 out_unlock: 2692 2699 mutex_unlock(&wl->mutex); ··· 2765 2774 } 2766 2775 } 2767 2776 2768 - pm_runtime_mark_last_busy(wl->dev); 2769 2777 pm_runtime_put_autosuspend(wl->dev); 2770 2778 } 2771 2779 deinit: ··· 3190 3200 } 3191 3201 3192 3202 out_sleep: 3193 - pm_runtime_mark_last_busy(wl->dev); 3194 3203 pm_runtime_put_autosuspend(wl->dev); 3195 3204 3196 3205 out: ··· 3304 3315 */ 3305 3316 3306 3317 out_sleep: 3307 - pm_runtime_mark_last_busy(wl->dev); 3308 3318 pm_runtime_put_autosuspend(wl->dev); 3309 3319 3310 3320 out: ··· 3519 3531 3520 3532 ret = wlcore_hw_set_key(wl, cmd, vif, sta, key_conf); 3521 3533 3522 - pm_runtime_mark_last_busy(wl->dev); 3523 3534 pm_runtime_put_autosuspend(wl->dev); 3524 3535 3525 3536 out_wake_queues: ··· 3682 3695 } 3683 3696 3684 3697 out_sleep: 3685 - pm_runtime_mark_last_busy(wl->dev); 3686 3698 pm_runtime_put_autosuspend(wl->dev); 3687 3699 3688 3700 out_unlock: ··· 3710 3724 goto out; 3711 3725 } 3712 3726 3713 - pm_runtime_mark_last_busy(wl->dev); 3714 3727 pm_runtime_put_autosuspend(wl->dev); 3715 3728 out: 3716 3729 mutex_unlock(&wl->mutex); ··· 3757 3772 3758 3773 ret = wlcore_scan(hw->priv, vif, ssid, len, req); 3759 3774 out_sleep: 3760 - pm_runtime_mark_last_busy(wl->dev); 3761 3775 pm_runtime_put_autosuspend(wl->dev); 3762 3776 out: 3763 3777 mutex_unlock(&wl->mutex); ··· 3807 3823 ieee80211_scan_completed(wl->hw, &info); 3808 3824 3809 3825 out_sleep: 3810 - pm_runtime_mark_last_busy(wl->dev); 3811 3826 pm_runtime_put_autosuspend(wl->dev); 3812 3827 out: 3813 3828 mutex_unlock(&wl->mutex); ··· 3843 3860 wl->sched_vif = wlvif; 3844 3861 3845 3862 out_sleep: 3846 - pm_runtime_mark_last_busy(wl->dev); 3847 3863 pm_runtime_put_autosuspend(wl->dev); 3848 3864 out: 3849 3865 mutex_unlock(&wl->mutex); ··· 3869 3887 3870 3888 wl->ops->sched_scan_stop(wl, wlvif); 3871 3889 3872 - pm_runtime_mark_last_busy(wl->dev); 3873 3890 pm_runtime_put_autosuspend(wl->dev); 3874 3891 out: 3875 3892 mutex_unlock(&wl->mutex); ··· 3897 3916 if (ret < 0) 3898 3917 wl1271_warning("wl1271_op_set_frag_threshold failed: %d", ret); 3899 3918 3900 - pm_runtime_mark_last_busy(wl->dev); 3901 3919 pm_runtime_put_autosuspend(wl->dev); 3902 3920 3903 3921 out: ··· 3928 3948 if (ret < 0) 3929 3949 wl1271_warning("set rts threshold failed: %d", ret); 3930 3950 } 3931 - pm_runtime_mark_last_busy(wl->dev); 3932 3951 pm_runtime_put_autosuspend(wl->dev); 3933 3952 3934 3953 out: ··· 4693 4714 else 4694 4715 wl1271_bss_info_changed_sta(wl, vif, bss_conf, changed); 4695 4716 4696 - pm_runtime_mark_last_busy(wl->dev); 4697 4717 pm_runtime_put_autosuspend(wl->dev); 4698 4718 4699 4719 out: ··· 4757 4779 } 4758 4780 } 4759 4781 4760 - pm_runtime_mark_last_busy(wl->dev); 4761 4782 pm_runtime_put_autosuspend(wl->dev); 4762 4783 out: 4763 4784 mutex_unlock(&wl->mutex); ··· 4805 4828 wlvif->radar_enabled = true; 4806 4829 } 4807 4830 4808 - pm_runtime_mark_last_busy(wl->dev); 4809 4831 pm_runtime_put_autosuspend(wl->dev); 4810 4832 out: 4811 4833 mutex_unlock(&wl->mutex); ··· 4847 4871 wlvif->radar_enabled = false; 4848 4872 } 4849 4873 4850 - pm_runtime_mark_last_busy(wl->dev); 4851 4874 pm_runtime_put_autosuspend(wl->dev); 4852 4875 out: 4853 4876 mutex_unlock(&wl->mutex); ··· 4916 4941 goto out_sleep; 4917 4942 } 4918 4943 out_sleep: 4919 - pm_runtime_mark_last_busy(wl->dev); 4920 4944 pm_runtime_put_autosuspend(wl->dev); 4921 4945 out: 4922 4946 mutex_unlock(&wl->mutex); ··· 4969 4995 0, 0); 4970 4996 4971 4997 out_sleep: 4972 - pm_runtime_mark_last_busy(wl->dev); 4973 4998 pm_runtime_put_autosuspend(wl->dev); 4974 4999 4975 5000 out: ··· 5002 5029 goto out_sleep; 5003 5030 5004 5031 out_sleep: 5005 - pm_runtime_mark_last_busy(wl->dev); 5006 5032 pm_runtime_put_autosuspend(wl->dev); 5007 5033 5008 5034 out: ··· 5314 5342 5315 5343 ret = wl12xx_update_sta_state(wl, wlvif, sta, old_state, new_state); 5316 5344 5317 - pm_runtime_mark_last_busy(wl->dev); 5318 5345 pm_runtime_put_autosuspend(wl->dev); 5319 5346 out: 5320 5347 mutex_unlock(&wl->mutex); ··· 5438 5467 ret = -EINVAL; 5439 5468 } 5440 5469 5441 - pm_runtime_mark_last_busy(wl->dev); 5442 5470 pm_runtime_put_autosuspend(wl->dev); 5443 5471 5444 5472 out: ··· 5481 5511 wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set); 5482 5512 ret = wl1271_acx_sta_rate_policies(wl, wlvif); 5483 5513 5484 - pm_runtime_mark_last_busy(wl->dev); 5485 5514 pm_runtime_put_autosuspend(wl->dev); 5486 5515 } 5487 5516 out: ··· 5535 5566 } 5536 5567 5537 5568 out_sleep: 5538 - pm_runtime_mark_last_busy(wl->dev); 5539 5569 pm_runtime_put_autosuspend(wl->dev); 5540 5570 5541 5571 out: ··· 5613 5645 set_bit(WLVIF_FLAG_CS_PROGRESS, &wlvif->flags); 5614 5646 5615 5647 out_sleep: 5616 - pm_runtime_mark_last_busy(wl->dev); 5617 5648 pm_runtime_put_autosuspend(wl->dev); 5618 5649 out: 5619 5650 mutex_unlock(&wl->mutex); ··· 5666 5699 ieee80211_queue_delayed_work(hw, &wl->roc_complete_work, 5667 5700 msecs_to_jiffies(duration)); 5668 5701 out_sleep: 5669 - pm_runtime_mark_last_busy(wl->dev); 5670 5702 pm_runtime_put_autosuspend(wl->dev); 5671 5703 out: 5672 5704 mutex_unlock(&wl->mutex); ··· 5714 5748 5715 5749 ret = __wlcore_roc_completed(wl); 5716 5750 5717 - pm_runtime_mark_last_busy(wl->dev); 5718 5751 pm_runtime_put_autosuspend(wl->dev); 5719 5752 out: 5720 5753 mutex_unlock(&wl->mutex); ··· 5804 5839 sinfo->signal = rssi_dbm; 5805 5840 5806 5841 out_sleep: 5807 - pm_runtime_mark_last_busy(wl->dev); 5808 5842 pm_runtime_put_autosuspend(wl->dev); 5809 5843 5810 5844 out:
-1
drivers/net/wireless/ti/wlcore/scan.c
··· 69 69 70 70 wlcore_cmd_regdomain_config_locked(wl); 71 71 72 - pm_runtime_mark_last_busy(wl->dev); 73 72 pm_runtime_put_autosuspend(wl->dev); 74 73 75 74 ieee80211_scan_completed(wl->hw, &info);
-1
drivers/net/wireless/ti/wlcore/sysfs.c
··· 58 58 goto out; 59 59 60 60 wl1271_acx_sg_enable(wl, wl->sg_enabled); 61 - pm_runtime_mark_last_busy(wl->dev); 62 61 pm_runtime_put_autosuspend(wl->dev); 63 62 64 63 out:
-2
drivers/net/wireless/ti/wlcore/testmode.c
··· 127 127 } 128 128 129 129 out_sleep: 130 - pm_runtime_mark_last_busy(wl->dev); 131 130 pm_runtime_put_autosuspend(wl->dev); 132 131 out: 133 132 mutex_unlock(&wl->mutex); ··· 191 192 out_free: 192 193 kfree(cmd); 193 194 out_sleep: 194 - pm_runtime_mark_last_busy(wl->dev); 195 195 pm_runtime_put_autosuspend(wl->dev); 196 196 out: 197 197 mutex_unlock(&wl->mutex);
-1
drivers/net/wireless/ti/wlcore/tx.c
··· 863 863 goto out; 864 864 } 865 865 866 - pm_runtime_mark_last_busy(wl->dev); 867 866 pm_runtime_put_autosuspend(wl->dev); 868 867 out: 869 868 mutex_unlock(&wl->mutex);
-3
drivers/net/wireless/ti/wlcore/vendor_cmd.c
··· 60 60 ret = wlcore_smart_config_start(wl, 61 61 nla_get_u32(tb[WLCORE_VENDOR_ATTR_GROUP_ID])); 62 62 63 - pm_runtime_mark_last_busy(wl->dev); 64 63 pm_runtime_put_autosuspend(wl->dev); 65 64 out: 66 65 mutex_unlock(&wl->mutex); ··· 91 92 92 93 ret = wlcore_smart_config_stop(wl); 93 94 94 - pm_runtime_mark_last_busy(wl->dev); 95 95 pm_runtime_put_autosuspend(wl->dev); 96 96 out: 97 97 mutex_unlock(&wl->mutex); ··· 138 140 nla_len(tb[WLCORE_VENDOR_ATTR_GROUP_KEY]), 139 141 nla_data(tb[WLCORE_VENDOR_ATTR_GROUP_KEY])); 140 142 141 - pm_runtime_mark_last_busy(wl->dev); 142 143 pm_runtime_put_autosuspend(wl->dev); 143 144 out: 144 145 mutex_unlock(&wl->mutex);