mt76: mt7915: remove SCS feature

SCS is obsoleted and no longer used, so remove it.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index c3c93338d56a34d5132bbf87196b91c74701e78c..561fb036870804ea3a7c4efa5dce1e1e47726612 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -974,7 +974,6 @@ enum {
        MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d,
        MCU_EXT_CMD_MWDS_SUPPORT = 0x80,
        MCU_EXT_CMD_SET_SER_TRIGGER = 0x81,
-       MCU_EXT_CMD_SCS_CTRL = 0x82,
        MCU_EXT_CMD_TWT_AGRT_UPDATE = 0x94,
        MCU_EXT_CMD_FW_DBG_CTRL = 0x95,
        MCU_EXT_CMD_OFFCH_SCAN_CTRL = 0x9a,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 9b8defb15b4e20dd2408f0f5fd9f2eb5c5f361e3..5177b19f915488d148281817d88b41aaa693c96b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -42,10 +42,6 @@ static int mt7915_start(struct ieee80211_hw *hw)
                if (ret)
                        goto out;
 
-               ret = mt7915_mcu_set_scs(dev, 0, true);
-               if (ret)
-                       goto out;
-
                mt7915_mac_enable_nf(dev, 0);
        }
 
@@ -58,10 +54,6 @@ static int mt7915_start(struct ieee80211_hw *hw)
                if (ret)
                        goto out;
 
-               ret = mt7915_mcu_set_scs(dev, 1, true);
-               if (ret)
-                       goto out;
-
                mt7915_mac_enable_nf(dev, 1);
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 6bd8e7591ad3b9cb93d18b69b76452f44068eccd..98a3b22ba549e45187de4e7e84e7cec7fd52a06b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2589,22 +2589,6 @@ int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band,
                                 &req_mac, sizeof(req_mac), true);
 }
 
-int mt7915_mcu_set_scs(struct mt7915_dev *dev, u8 band, bool enable)
-{
-       struct {
-               __le32 cmd;
-               u8 band;
-               u8 enable;
-       } __packed req = {
-               .cmd = cpu_to_le32(SCS_ENABLE),
-               .band = band,
-               .enable = enable + 1,
-       };
-
-       return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(SCS_CTRL), &req,
-                                sizeof(req), false);
-}
-
 int mt7915_mcu_update_edca(struct mt7915_dev *dev, void *param)
 {
        struct mt7915_mcu_tx *req = (struct mt7915_mcu_tx *)param;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 960072a442223a5303429ed50e5fe567370ef5f9..064d33e33738a68a8625049e5f6d237d7d2c879c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -304,16 +304,6 @@ enum mcu_mmps_mode {
        MCU_MMPS_DISABLE,
 };
 
-enum {
-       SCS_SEND_DATA,
-       SCS_SET_MANUAL_PD_TH,
-       SCS_CONFIG,
-       SCS_ENABLE,
-       SCS_SHOW_INFO,
-       SCS_GET_GLO_ADDR,
-       SCS_GET_GLO_ADDR_EVENT,
-};
-
 struct bss_info_bmc_rate {
        __le16 tag;
        __le16 len;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index ca129e5e380e137ea40ad41d74f4b94a750a07b2..419ff08176b4e8eed7ed2ae2a775af2148d0adbf 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -486,7 +486,6 @@ int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band, bool enable,
                       bool hdr_trans);
 int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,
                              u8 en);
-int mt7915_mcu_set_scs(struct mt7915_dev *dev, u8 band, bool enable);
 int mt7915_mcu_set_ser(struct mt7915_dev *dev, u8 action, u8 set, u8 band);
 int mt7915_mcu_set_sku_en(struct mt7915_phy *phy, bool enable);
 int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy);