mt76: Use fallthrough pseudo-keyword

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/v5.7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index 46be157..d60d00f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -121,7 +121,7 @@ void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                        mt76_rx(&dev->mt76, q, skb);
                        return;
                }
-               /* fall through */
+               fallthrough;
        default:
                dev_kfree_skb(skb);
                break;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 97679eb..f665a1c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -592,7 +592,7 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)
                switch (FIELD_GET(MT_RXV1_TX_MODE, rxdg0)) {
                case MT_PHY_TYPE_CCK:
                        cck = true;
-                       /* fall through */
+                       fallthrough;
                case MT_PHY_TYPE_OFDM:
                        i = mt76_get_rate(&dev->mt76, sband, i, cck);
                        break;
@@ -1163,7 +1163,7 @@ out:
        switch (FIELD_GET(MT_TX_RATE_MODE, final_rate)) {
        case MT_PHY_TYPE_CCK:
                cck = true;
-               /* fall through */
+               fallthrough;
        case MT_PHY_TYPE_OFDM:
                if (dev->mphy.chandef.chan->band == NL80211_BAND_5GHZ)
                        sband = &dev->mphy.sband_5g.sband;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index ab1fbf4..8dc645e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -378,7 +378,7 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
                switch (FIELD_GET(MT_RXV1_TX_MODE, rxdg0)) {
                case MT_PHY_TYPE_CCK:
                        cck = true;
-                       /* fall through */
+                       fallthrough;
                case MT_PHY_TYPE_OFDM:
                        i = mt76_get_rate(&dev->mt76, sband, i, cck);
                        break;
@@ -1271,7 +1271,7 @@ out:
        switch (FIELD_GET(MT_TX_RATE_MODE, final_rate)) {
        case MT_PHY_TYPE_CCK:
                cck = true;
-               /* fall through */
+               fallthrough;
        case MT_PHY_TYPE_OFDM:
                mphy = &dev->mphy;
                if (sta->wcid.ext_phy && dev->mt76.phy2)
@@ -1497,7 +1497,7 @@ void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                        mt76_rx(&dev->mt76, q, skb);
                        return;
                }
-               /* fall through */
+               fallthrough;
        default:
                dev_kfree_skb(skb);
                break;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index dae080e..8de9bba 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -3292,7 +3292,7 @@ static int mt7615_dcoc_freq_idx(u16 freq, u8 bw)
                        freq = freq_bw40[idx];
                        break;
                }
-               /* fall through */
+               fallthrough;
        case NL80211_CHAN_WIDTH_40:
                idx = mt7615_find_freq_idx(freq_bw40, ARRAY_SIZE(freq_bw40),
                                           freq);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index 09f34de..3de33aa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -734,7 +734,7 @@ mt76x0_phy_get_delta_power(struct mt76x02_dev *dev, u8 tx_mode,
        case 1:
                if (chan->band == NL80211_BAND_2GHZ)
                        tssi_target += 29491; /* 3.6 * 8192 */
-               /* fall through */
+               fallthrough;
        case 0:
                break;
        default:

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 8529837..da6d3f5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -300,7 +300,7 @@ mt76x02_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate,
                return 0;
        case MT_PHY_TYPE_HT_GF:
                txrate->flags |= IEEE80211_TX_RC_GREEN_FIELD;
-               /* fall through */
+               fallthrough;
        case MT_PHY_TYPE_HT:
                txrate->flags |= IEEE80211_TX_RC_MCS;
                txrate->idx = idx;
@@ -464,7 +464,7 @@ mt76x02_tx_rate_fallback(struct ieee80211_tx_rate *rates, int idx, int phy)
                        rates[1].idx = 0;
                        break;
                }
-               /* fall through */
+               fallthrough;
        default:
                rates[1].idx = max_t(int, rates[0].idx - 1, 0);
                break;
@@ -679,7 +679,7 @@ mt76x02_mac_process_rate(struct mt76x02_dev *dev,
                return 0;
        case MT_PHY_TYPE_HT_GF:
                status->enc_flags |= RX_ENC_FLAG_HT_GF;
-               /* fall through */
+               fallthrough;
        case MT_PHY_TYPE_HT:
                status->encoding = RX_ENC_HT;
                status->rate_idx = idx;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 0f5de05..1049927 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -21,7 +21,6 @@ static int mt7915_ser_trigger_set(void *data, u64 val)
        switch (val) {
        case SER_SET_RECOVER_L1:
        case SER_SET_RECOVER_L2:
-               /* fall through */
                ret = mt7915_mcu_set_ser(dev, SER_ENABLE, BIT(val), 0);
                if (ret)
                        return ret;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
index 875badc..cfa12c4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
@@ -66,7 +66,7 @@ void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                        mt76_rx(&dev->mt76, q, skb);
                        return;
                }
-               /* fall through */
+               fallthrough;
        default:
                dev_kfree_skb(skb);
                break;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index defd0a9..c382e5f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -471,7 +471,7 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
                        switch (mode) {
                        case MT_PHY_TYPE_CCK:
                                cck = true;
-                               /* fall through */
+                               fallthrough;
                        case MT_PHY_TYPE_OFDM:
                                i = mt76_get_rate(&dev->mt76, sband, i, cck);
                                break;
@@ -490,7 +490,7 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
                                break;
                        case MT_PHY_TYPE_HE_MU:
                                status->flag |= RX_FLAG_RADIOTAP_HE_MU;
-                               /* fall through */
+                               fallthrough;
                        case MT_PHY_TYPE_HE_SU:
                        case MT_PHY_TYPE_HE_EXT_SU:
                        case MT_PHY_TYPE_HE_TB:

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index fdc2e1e..d43de43 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -1431,7 +1431,7 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
 
                he->max_nss_mcs[CMD_HE_MCS_BW160] =
                                he_cap->he_mcs_nss_supp.rx_mcs_160;
-               /* fall through */
+               fallthrough;
        default:
                he->max_nss_mcs[CMD_HE_MCS_BW80] =
                                he_cap->he_mcs_nss_supp.rx_mcs_80;

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index edbcabd..7d3f0a2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -616,7 +616,7 @@ static void mt76u_complete_rx(struct urb *urb)
        default:
                dev_err_ratelimited(dev->dev, "rx urb failed: %d\n",
                                    urb->status);
-               /* fall through */
+               fallthrough;
        case 0:
                break;
        }