wifi: rtw88: Drop coex mutex

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

diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index 6276ad6242991ae15ece36b1b2cd42940b5193ad..38697237ee5f03958b2a643ae5451c1a5f5891f8 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -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);
 
@@ -650,7 +650,6 @@ static struct sk_buff *rtw_coex_info_request(struct rtw_dev *rtwdev,
        }
 
 out:
-       mutex_unlock(&coex->mutex);
        return skb_resp;
 }
 

diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c
index f5b8a77ebc67b96e409fe6fe207163a3e6478395..fa3d73b333ba0bb34e7e41e8f9a67e33ecab1fc7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/debug.c
+++ b/drivers/net/wireless/realtek/rtw88/debug.c
@@ -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;
 }

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index c98e56890401cf78cc668ec0eb563a4ff1d29c32..0a2ce7f50f4127f29a13e4dd638a6bf9087df6ba 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -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);
@@ -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);

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 4b57542bef1e939effd732459fb5e82472edb247..77fd48b6cc45390a6a4ec87e9e3d3c6d09df4ae1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -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;