mt76: mt7921: move mt7921_usb_sdio_tx_status_data in mac common code.

This is a preliminary patch to add mt7921u driver support.

Tested-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 0c1b6565310254bf57aa6ae5bca1dfe5a99d1291..263ac62d88b7ddc3bb43849b37b0698567232ce6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -1701,3 +1701,15 @@ void mt7921_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,
        mt76_tx_complete_skb(mdev, e->wcid, e->skb);
 }
 EXPORT_SYMBOL_GPL(mt7921_usb_sdio_tx_complete_skb);
+
+bool mt7921_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update)
+{
+       struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
+
+       mt7921_mutex_acquire(dev);
+       mt7921_mac_sta_poll(dev);
+       mt7921_mutex_release(dev);
+
+       return false;
+}
+EXPORT_SYMBOL_GPL(mt7921_usb_sdio_tx_status_data);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 32b77fe49abd511142cbcf5a16705f7c2ff26c79..e0d67756673fdcebc1dd521e9f938ef6044fe291 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -444,7 +444,6 @@ int mt7921e_mcu_fw_pmctrl(struct mt7921_dev *dev);
 int mt7921s_mcu_init(struct mt7921_dev *dev);
 int mt7921s_mcu_drv_pmctrl(struct mt7921_dev *dev);
 int mt7921s_mcu_fw_pmctrl(struct mt7921_dev *dev);
-bool mt7921s_tx_status_data(struct mt76_dev *mdev, u8 *update);
 void mt7921_mac_add_txs(struct mt7921_dev *dev, void *data);
 void mt7921_set_runtime_pm(struct mt7921_dev *dev);
 int mt7921_mcu_set_sniffer(struct mt7921_dev *dev, struct ieee80211_vif *vif,
@@ -456,4 +455,5 @@ int mt7921_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                                   struct mt76_tx_info *tx_info);
 void mt7921_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,
                                     struct mt76_queue_entry *e);
+bool mt7921_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update);
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
index 507bd550b0636da8bd0e41f89d9488e86e06c306..9b2bc0b11492e3a91ef54f0d3a69b117f3ead84e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
@@ -93,7 +93,7 @@ static int mt7921s_probe(struct sdio_func *func,
                                SURVEY_INFO_TIME_BSS_RX,
                .tx_prepare_skb = mt7921_usb_sdio_tx_prepare_skb,
                .tx_complete_skb = mt7921_usb_sdio_tx_complete_skb,
-               .tx_status_data = mt7921s_tx_status_data,
+               .tx_status_data = mt7921_usb_sdio_tx_status_data,
                .rx_skb = mt7921_queue_rx_skb,
                .sta_ps = mt7921_sta_ps,
                .sta_add = mt7921_mac_sta_add,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
index fa9db21bb3e8bb260e9ef391689fa9032919b269..1b3adb3d91e8669cba891e5652025dc52abb58f2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
@@ -140,14 +140,3 @@ out:
 
        return err;
 }
-
-bool mt7921s_tx_status_data(struct mt76_dev *mdev, u8 *update)
-{
-       struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
-
-       mt7921_mutex_acquire(dev);
-       mt7921_mac_sta_poll(dev);
-       mt7921_mutex_release(dev);
-
-       return false;
-}