mt76: move mt76x2_wait_for_bbp in mt76x02-lib module

Move mt76x2_wait_for_bbp utility routine in mt76x02_util.h
in order to be resued by mt76x0 driver. Morover rename it in
mt76x02_wait_for_txrx_idle

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
index 479e7ffcc9510fee01df39304d023caa633e28b3..cd9282194c97c9295060c4dab14386d080422229 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
@@ -66,4 +66,12 @@ static inline void mt76x02_irq_disable(struct mt76_dev *dev, u32 mask)
        mt76x02_set_irq_mask(dev, mask, 0);
 }
 
+static inline bool
+mt76x02_wait_for_txrx_idle(struct mt76_dev *dev)
+{
+       return __mt76_poll_msec(dev, MT_MAC_STATUS,
+                               MT_MAC_STATUS_TX | MT_MAC_STATUS_RX,
+                               0, 100);
+}
+
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2.h
index c51d6e2a64ce1141680038562a1b11718ed97be3..9bf8be5ea1cdccd32461aed46f81c24ecdc25ed4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2.h
@@ -124,13 +124,6 @@ static inline bool mt76x2_channel_silent(struct mt76x2_dev *dev)
                chan->dfs_state != NL80211_DFS_AVAILABLE);
 }
 
-static inline bool mt76x2_wait_for_bbp(struct mt76x2_dev *dev)
-{
-       return mt76_poll_msec(dev, MT_MAC_STATUS,
-                             MT_MAC_STATUS_TX | MT_MAC_STATUS_RX,
-                             0, 100);
-}
-
 extern const struct ieee80211_ops mt76x2_ops;
 
 struct mt76x2_dev *mt76x2_alloc_device(struct device *pdev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c
index 4eb3fe657bd2d3db1fdfe2774f299c1e3bc7dca7..788c36aa0f7db498eb01d445bc85c71ddf1670f9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c
@@ -209,7 +209,7 @@ int mt76x2u_init_hardware(struct mt76x2_dev *dev)
 
        mt76x2u_init_beacon_offsets(dev);
 
-       if (!mt76x2_wait_for_bbp(dev))
+       if (!mt76x02_wait_for_txrx_idle(&dev->mt76))
                return -ETIMEDOUT;
 
        /* reset wcid table */