From: Johannes Berg All of this code already holds the wiphy mutex, so none needs the _rcu() variant. Simplify the code. Signed-off-by: Johannes Berg --- drivers/net/wireless/realtek/rtw89/cam.c | 4 +--- drivers/net/wireless/realtek/rtw89/wow.c | 12 ++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/cam.c b/drivers/net/wireless/realtek/rtw89/cam.c index 7c62ece137d0..22f21a04a96d 100644 --- a/drivers/net/wireless/realtek/rtw89/cam.c +++ b/drivers/net/wireless/realtek/rtw89/cam.c @@ -605,9 +605,7 @@ void rtw89_cam_deinit(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_li void rtw89_cam_reset_keys(struct rtw89_dev *rtwdev) { - rcu_read_lock(); - ieee80211_iter_keys_rcu(rtwdev->hw, NULL, rtw89_cam_reset_key_iter, rtwdev); - rcu_read_unlock(); + ieee80211_iter_keys(rtwdev->hw, NULL, rtw89_cam_reset_key_iter, rtwdev); } static int rtw89_cam_get_avail_addr_cam(struct rtw89_dev *rtwdev, diff --git a/drivers/net/wireless/realtek/rtw89/wow.c b/drivers/net/wireless/realtek/rtw89/wow.c index 2dfa24c54e7d..0bf34692c7ce 100644 --- a/drivers/net/wireless/realtek/rtw89/wow.c +++ b/drivers/net/wireless/realtek/rtw89/wow.c @@ -473,10 +473,8 @@ static void rtw89_wow_construct_key_info(struct rtw89_dev *rtwdev) struct ieee80211_vif *wow_vif = rtwvif_link_to_vif(rtwvif_link); bool err = false; - rcu_read_lock(); - ieee80211_iter_keys_rcu(rtwdev->hw, wow_vif, - rtw89_wow_get_key_info_iter, &err); - rcu_read_unlock(); + ieee80211_iter_keys(rtwdev->hw, wow_vif, + rtw89_wow_get_key_info_iter, &err); if (err) { rtw89_wow_key_clear(rtwdev); @@ -695,10 +693,8 @@ static void rtw89_wow_update_key_info(struct rtw89_dev *rtwdev, bool rx_ready) struct ieee80211_bss_conf *bss_conf; struct ieee80211_key_conf *key; - rcu_read_lock(); - ieee80211_iter_keys_rcu(rtwdev->hw, wow_vif, - rtw89_wow_set_key_info_iter, &data); - rcu_read_unlock(); + ieee80211_iter_keys(rtwdev->hw, wow_vif, + rtw89_wow_set_key_info_iter, &data); if (data.error) { rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s error\n", __func__); -- 2.55.0