Skip to content

Commit

Permalink
wifi: rtw88: Drop coex mutex
Browse files Browse the repository at this point in the history
coex->mutex is used in rtw_coex_info_request() only. Most callers of this
function hold rtwdev->mutex already, except for one callsite in the
debugfs code. The debugfs code alone doesn't justify the extra lock, so
acquire rtwdev->mutex there as well and drop the now unnecessary
spinlock.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221202081224.2779981-6-s.hauer@pengutronix.de
  • Loading branch information
Sascha Hauer authored and Kalle Valo committed Dec 8, 2022
1 parent 1e2701f commit 8647f7f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions drivers/net/wireless/realtek/rtw88/coex.c
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ static struct sk_buff *rtw_coex_info_request(struct rtw_dev *rtwdev,
struct rtw_coex *coex = &rtwdev->coex;
struct sk_buff *skb_resp = NULL;

mutex_lock(&coex->mutex);
lockdep_assert_held(&rtwdev->mutex);

rtw_fw_query_bt_mp_info(rtwdev, req);

Expand All @@ -650,7 +650,6 @@ static struct sk_buff *rtw_coex_info_request(struct rtw_dev *rtwdev,
}

out:
mutex_unlock(&coex->mutex);
return skb_resp;
}

Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/realtek/rtw88/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,9 @@ static int rtw_debugfs_get_coex_info(struct seq_file *m, void *v)
struct rtw_debugfs_priv *debugfs_priv = m->private;
struct rtw_dev *rtwdev = debugfs_priv->rtwdev;

mutex_lock(&rtwdev->mutex);
rtw_coex_display_coex_info(rtwdev, m);
mutex_unlock(&rtwdev->mutex);

return 0;
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/realtek/rtw88/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2071,7 +2071,6 @@ int rtw_core_init(struct rtw_dev *rtwdev)
spin_lock_init(&rtwdev->tx_report.q_lock);

mutex_init(&rtwdev->mutex);
mutex_init(&rtwdev->coex.mutex);
mutex_init(&rtwdev->hal.tx_power_mutex);

init_waitqueue_head(&rtwdev->coex.wait);
Expand Down Expand Up @@ -2143,7 +2142,6 @@ void rtw_core_deinit(struct rtw_dev *rtwdev)
}

mutex_destroy(&rtwdev->mutex);
mutex_destroy(&rtwdev->coex.mutex);
mutex_destroy(&rtwdev->hal.tx_power_mutex);
}
EXPORT_SYMBOL(rtw_core_deinit);
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/realtek/rtw88/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -1501,8 +1501,6 @@ struct rtw_coex_stat {
};

struct rtw_coex {
/* protects coex info request section */
struct mutex mutex;
struct sk_buff_head queue;
wait_queue_head_t wait;

Expand Down

0 comments on commit 8647f7f

Please sign in to comment.