UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Gustavo A. R. Silva 2020-08-21 01:37:58 -05:00 committed by Kalle Valo
parent 07a297a9e6
commit 0bde10dc55
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
View File

@ -916,9 +916,7 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE; f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;
break; break;
case SDIO_DEVICE_ID_BROADCOM_4359: case SDIO_DEVICE_ID_BROADCOM_4359:
/* fallthrough */
case SDIO_DEVICE_ID_BROADCOM_4354: case SDIO_DEVICE_ID_BROADCOM_4354:
/* fallthrough */
case SDIO_DEVICE_ID_BROADCOM_4356: case SDIO_DEVICE_ID_BROADCOM_4356:
f2_blksz = SDIO_435X_FUNC2_BLOCKSIZE; f2_blksz = SDIO_435X_FUNC2_BLOCKSIZE;
break; break;

8
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
View File

@ -3477,7 +3477,7 @@ brcmf_get_netinfo_array(struct brcmf_pno_scanresults_le *pfn_v1)
switch (pfn_v1->version) { switch (pfn_v1->version) {
default: default:
WARN_ON(1); WARN_ON(1);
/* fall-thru */ fallthrough;
case cpu_to_le32(1): case cpu_to_le32(1):
netinfo = (struct brcmf_pno_net_info_le *)(pfn_v1 + 1); netinfo = (struct brcmf_pno_net_info_le *)(pfn_v1 + 1);
break; break;
@ -6473,7 +6473,7 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
default: default:
wiphy_warn(wiphy, "Firmware reported unsupported bandwidth %d\n", wiphy_warn(wiphy, "Firmware reported unsupported bandwidth %d\n",
ch.bw); ch.bw);
/* fall through */ fallthrough;
case BRCMU_CHAN_BW_20: case BRCMU_CHAN_BW_20:
/* enable the channel and disable other bandwidths /* enable the channel and disable other bandwidths
* for now as mentioned order assure they are enabled * 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) { switch (mimo_bwcap) {
case WLC_N_BW_40ALL: case WLC_N_BW_40ALL:
bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_40MHZ_BIT; bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_40MHZ_BIT;
/* fall-thru */ fallthrough;
case WLC_N_BW_20IN2G_40IN5G: case WLC_N_BW_20IN2G_40IN5G:
bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_40MHZ_BIT; bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_40MHZ_BIT;
/* fall-thru */ fallthrough;
case WLC_N_BW_20ALL: case WLC_N_BW_20ALL:
bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_20MHZ_BIT; bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_20MHZ_BIT;
bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT; bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT;

2
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
View File

@ -1390,7 +1390,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
case BRCM_CC_4345_CHIP_ID: case BRCM_CC_4345_CHIP_ID:
/* explicitly check SR engine enable bit */ /* explicitly check SR engine enable bit */
pmu_cc3_mask = BIT(2); pmu_cc3_mask = BIT(2);
/* fall-through */ fallthrough;
case BRCM_CC_43241_CHIP_ID: case BRCM_CC_43241_CHIP_ID:
case BRCM_CC_4335_CHIP_ID: case BRCM_CC_4335_CHIP_ID:
case BRCM_CC_4339_CHIP_ID: case BRCM_CC_4339_CHIP_ID:

2
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
View File

@ -4299,9 +4299,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
CY_43455_MESBUSYCTRL, &err); CY_43455_MESBUSYCTRL, &err);
break; break;
case SDIO_DEVICE_ID_BROADCOM_4359: case SDIO_DEVICE_ID_BROADCOM_4359:
/* fallthrough */
case SDIO_DEVICE_ID_BROADCOM_4354: case SDIO_DEVICE_ID_BROADCOM_4354:
/* fallthrough */
case SDIO_DEVICE_ID_BROADCOM_4356: case SDIO_DEVICE_ID_BROADCOM_4356:
brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n", brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
CY_435X_F2_WATERMARK); CY_435X_F2_WATERMARK);