rt2x00: Use fallthrough pseudo-keyword macro
Subsystems (3)
PATCH 1/1 rt2x00: Use fallthrough pseudo-keyword macro
Replace all '/* fall through */' comments with the macro[1].
Signed-off-by Leesoo Ahn <[email protected]>
--- .../net/wireless/ralink/rt2x00/rt2400pci.c | 3 ++- .../net/wireless/ralink/rt2x00/rt2500pci.c | 3 ++- .../net/wireless/ralink/rt2x00/rt2800lib.c | 27 ++++++++++--------- drivers/net/wireless/ralink/rt2x00/rt61pci.c | 3 ++- 4 files changed, 20 insertions(+), 16 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2400pci.c +2 -1
@@ -1291,7 +1291,8 @@ static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev,break ;case 2 :/* Failure, excessive retries */ __set_bit (TXDONE_EXCESSIVE_RETRY , &txdesc.flags); -/* Fall through - this is a failed frame! */ +/* this is a failed frame! */ + fallthrough;default :/* Failure */ __set_bit (TXDONE_FAILURE , &txdesc.flags); }
drivers/net/wireless/ralink/rt2x00/rt2500pci.c +2 -1
@@ -1419,7 +1419,8 @@ static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev,break ;case 2 :/* Failure, excessive retries */ __set_bit (TXDONE_EXCESSIVE_RETRY , &txdesc.flags); -/* Fall through - this is a failed frame! */ +/* this is a failed frame! */ + fallthrough;default :/* Failure */ __set_bit (TXDONE_FAILURE , &txdesc.flags); }
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +14 -13
@@ -928,7 +928,7 @@ static void rt2800_rate_from_status(struct skb_frame_desc *skbdesc,switch (rt2x00_get_field32 (status,TX_STA_FIFO_PHYMODE )) {case RATE_MODE_HT_GREENFIELD : flags |=IEEE80211_TX_RC_GREEN_FIELD ; -/* fall through */ + fallthrough;case RATE_MODE_HT_MIX : flags |=IEEE80211_TX_RC_MCS ;break ;
@@ -2037,6 +2037,7 @@ static void rt2800_config_ht_opmode(struct rt2x00_dev *rt2x00dev,* We decide to protect everything * -> fall through to mixed mode. */ + fallthrough;case IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED :/* * Legacy STAs are present
@@ -2567,7 +2568,7 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev,switch (rt2x00dev->default_ant.tx_chain_num) {case 1 :rt2x00_set_field8 (&rfcsr,RFCSR1_TX1_PD ,1 ); -/* fall through */ + fallthrough;case 2 :rt2x00_set_field8 (&rfcsr,RFCSR1_TX2_PD ,1 );break ;
@@ -2576,7 +2577,7 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev,switch (rt2x00dev->default_ant.rx_chain_num) {case 1 :rt2x00_set_field8 (&rfcsr,RFCSR1_RX1_PD ,1 ); -/* fall through */ + fallthrough;case 2 :rt2x00_set_field8 (&rfcsr,RFCSR1_RX2_PD ,1 );break ;
@@ -4216,14 +4217,14 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, rf->channel > 14);rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_G2_EN , rf->channel <=14 ); -/* fall-through */ + fallthrough;case 2 :/* Turn on secondary PAs */ rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_A1_EN , rf->channel >14 );rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_G1_EN , rf->channel <=14 ); -/* fall-through */ + fallthrough;case 1 :/* Turn on primary PAs */ rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A0_EN,
@@ -4241,12 +4242,12 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,/* Turn on tertiary LNAs */ rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_LNA_PE_A2_EN ,1 );rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_LNA_PE_G2_EN ,1 ); -/* fall-through */ + fallthrough;case 2 :/* Turn on secondary LNAs */ rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_LNA_PE_A1_EN ,1 );rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_LNA_PE_G1_EN ,1 ); -/* fall-through */ + fallthrough;case 1 :/* Turn on primary LNAs */ rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_LNA_PE_A0_EN ,1 );
@@ -5438,10 +5439,10 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)switch (rt2x00dev->default_ant.tx_chain_num) {case 3 :rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_G2_EN ,1 ); -/* fall through */ + fallthrough;case 2 :rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_G1_EN ,1 ); -/* fall through */ + fallthrough;case 1 :default :rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_G0_EN ,1 );
@@ -5451,10 +5452,10 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)switch (rt2x00dev->default_ant.tx_chain_num) {case 3 :rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_A2_EN ,1 ); -/* fall through */ + fallthrough;case 2 :rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_A1_EN ,1 ); -/* fall through */ + fallthrough;case 1 :default :rt2x00_set_field32 (&tx_pin,TX_PIN_CFG_PA_PE_A0_EN ,1 );
@@ -10100,10 +10101,10 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)switch (rx_chains) {case 3 : spec->ht.mcs.rx_mask[2 ] =0xff ; -/* fall through */ + fallthrough;case 2 : spec->ht.mcs.rx_mask[1 ] =0xff ; -/* fall through */ + fallthrough;case 1 : spec->ht.mcs.rx_mask[0 ] =0xff ; spec->ht.mcs.rx_mask[4 ] =0x1 ;/* MCS32 */
drivers/net/wireless/ralink/rt2x00/rt61pci.c +2 -1
@@ -2130,7 +2130,8 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)break ;case 6 :/* Failure, excessive retries */ __set_bit (TXDONE_EXCESSIVE_RETRY , &txdesc.flags); -/* Fall through - this is a failed frame! */ +/* this is a failed frame! */ + fallthrough;default :/* Failure */ __set_bit (TXDONE_FAILURE , &txdesc.flags); }
Signature · 1 line
2.25.4
Quoted 4 lines · Leesoo Ahn
Replace all '/* fall through */' comments with the macro[1].
This looks familiar...
https://lore.kernel.org/lkml/20200821062052.GA8618@embeddedor/
Thanks
--
Gustavo
20. 9. 2. 오후 11:20에 Gustavo A. R. Silva 이(가) 쓴 글:
Quoted 8 lines · Leesoo Ahn
Quoted 4 lines
Replace all '/* fall through */' comments with the macro[1].
Quoted 8 lines
This looks familiar...
https://lore.kernel.org/lkml/20200821062052.GA8618@embeddedor/
Thanks
--
Gustavo
I didn't notice the patch. Please, ignore this.
Thanks
Leesoo