brcmfmac: 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: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200821063758.GA17783@embeddedor

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 1a7ab49295aa4a495bf3914205eb4f9d1b343bf2..0dc4de2fa9f64dfec379b972a1ae9b37908b39be 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -916,9 +916,7 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
                f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;
                break;
        case SDIO_DEVICE_ID_BROADCOM_4359:
-               /* fallthrough */
        case SDIO_DEVICE_ID_BROADCOM_4354:
-               /* fallthrough */
        case SDIO_DEVICE_ID_BROADCOM_4356:
                f2_blksz = SDIO_435X_FUNC2_BLOCKSIZE;
                break;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 444639f09aa4beb54dcd3aebd244b559a402fbc1..8b5fda9bb8539f7a031685288446866ab85f51cc 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3477,7 +3477,7 @@ brcmf_get_netinfo_array(struct brcmf_pno_scanresults_le *pfn_v1)
        switch (pfn_v1->version) {
        default:
                WARN_ON(1);
-               /* fall-thru */
+               fallthrough;
        case cpu_to_le32(1):
                netinfo = (struct brcmf_pno_net_info_le *)(pfn_v1 + 1);
                break;
@@ -6473,7 +6473,7 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
                default:
                        wiphy_warn(wiphy, "Firmware reported unsupported bandwidth %d\n",
                                   ch.bw);
-                       /* fall through */
+                       fallthrough;
                case BRCMU_CHAN_BW_20:
                        /* enable the channel and disable other bandwidths
                         * for now as mentioned order assure they are enabled
@@ -6611,10 +6611,10 @@ static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])
        switch (mimo_bwcap) {
        case WLC_N_BW_40ALL:
                bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_40MHZ_BIT;
-               /* fall-thru */
+               fallthrough;
        case WLC_N_BW_20IN2G_40IN5G:
                bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_40MHZ_BIT;
-               /* fall-thru */
+               fallthrough;
        case WLC_N_BW_20ALL:
                bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_20MHZ_BIT;
                bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
index a3a2570896967725b17225434fc64d74d94c3f83..5bf11e46fc49a996e2a137c4e8c2921e7e3c6bd4 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
@@ -1390,7 +1390,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
        case BRCM_CC_4345_CHIP_ID:
                /* explicitly check SR engine enable bit */
                pmu_cc3_mask = BIT(2);
-               /* fall-through */
+               fallthrough;
        case BRCM_CC_43241_CHIP_ID:
        case BRCM_CC_4335_CHIP_ID:
        case BRCM_CC_4339_CHIP_ID:

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index e8712ad3ac45c46b29740cb4482eb78aba8075a8..8e881be60c153264a62e8ae0bec29d5527ff7b78 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4299,9 +4299,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
                                           CY_43455_MESBUSYCTRL, &err);
                        break;
                case SDIO_DEVICE_ID_BROADCOM_4359:
-                       /* fallthrough */
                case SDIO_DEVICE_ID_BROADCOM_4354:
-                       /* fallthrough */
                case SDIO_DEVICE_ID_BROADCOM_4356:
                        brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
                                  CY_435X_F2_WATERMARK);