mt76: Remove set but not used variables 'pid' and 'final_mpdu'

Fixes gcc '-Wunused-but-set-variable' warnings:

drivers/net/wireless/mediatek/mt76/mt7603/mac.c: In function mt7603_fill_txs:
drivers/net/wireless/mediatek/mt76/mt7603/mac.c:969:5: warning: variable pid set but not used [-Wunused-but-set-variable]
drivers/net/wireless/mediatek/mt76/mt7603/mac.c:961:7: warning: variable final_mpdu set but not used [-Wunused-but-set-variable]
drivers/net/wireless/mediatek/mt76/mt7615/mac.c: In function mt7615_fill_txs:
drivers/net/wireless/mediatek/mt76/mt7615/mac.c:555:5: warning: variable pid set but not used [-Wunused-but-set-variable]
drivers/net/wireless/mediatek/mt76/mt7615/mac.c:552:19: warning: variable final_mpdu set but not used [-Wunused-but-set-variable]

They are never used, so can be removed.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 2648fa333f93b996c6a8c18597ef1571811d717a..6629dd64cc223ec77a7dfff67659de267c5a9dce 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -909,7 +909,6 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta,
        int final_idx = 0;
        u32 final_rate;
        u32 final_rate_flags;
-       bool final_mpdu;
        bool ack_timeout;
        bool fixed_rate;
        bool probe;
@@ -917,7 +916,6 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta,
        bool cck = false;
        int count;
        u32 txs;
-       u8 pid;
        int idx;
        int i;
 
@@ -925,9 +923,7 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta,
        probe = !!(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);
 
        txs = le32_to_cpu(txs_data[4]);
-       final_mpdu = txs & MT_TXS4_ACKED_MPDU;
        ampdu = !fixed_rate && (txs & MT_TXS4_AMPDU);
-       pid = FIELD_GET(MT_TXS4_PID, txs);
        count = FIELD_GET(MT_TXS4_TX_COUNT, txs);
 
        txs = le32_to_cpu(txs_data[0]);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 7ca2e31f96fcc1fafabba1b8951b74ae262459f8..b60d42b5923d5515d9568f408b4919e4b934a543 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -504,23 +504,20 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,
 {
        struct ieee80211_supported_band *sband;
        int i, idx, count, final_idx = 0;
-       bool fixed_rate, final_mpdu, ack_timeout;
+       bool fixed_rate, ack_timeout;
        bool probe, ampdu, cck = false;
        u32 final_rate, final_rate_flags, final_nss, txs;
-       u8 pid;
 
        fixed_rate = info->status.rates[0].count;
        probe = !!(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);
 
        txs = le32_to_cpu(txs_data[1]);
-       final_mpdu = txs & MT_TXS1_ACKED_MPDU;
        ampdu = !fixed_rate && (txs & MT_TXS1_AMPDU);
 
        txs = le32_to_cpu(txs_data[3]);
        count = FIELD_GET(MT_TXS3_TX_COUNT, txs);
 
        txs = le32_to_cpu(txs_data[0]);
-       pid = FIELD_GET(MT_TXS0_PID, txs);
        final_rate = FIELD_GET(MT_TXS0_TX_RATE, txs);
        ack_timeout = txs & MT_TXS0_ACK_TIMEOUT;