Commit 5463fce6 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by Tony Nguyen
Browse files

ethernet/intel: Convert fallthrough code comments 



Convert all the remaining 'fall through" code comments to the newer
'fallthrough;' keyword.

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 2b04a661

drivers/net/ethernet/intel/e1000/e1000_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -4526,7 +4526,7 @@ s32 e1000_setup_led(struct e1000_hw *hw) 
						     ~IGP01E1000_GMII_SPD));

		if (ret_val)

			return ret_val;

		/* Fall Through */

		fallthrough;

	default:

		if (hw->media_type == e1000_media_type_fiber) {

			ledctl = er32(LEDCTL);
@@ -4571,7 +4571,7 @@ s32 e1000_cleanup_led(struct e1000_hw *hw) 
					      hw->phy_spd_default);

		if (ret_val)

			return ret_val;

		/* Fall Through */

		fallthrough;

	default:

		/* Restore LEDCTL settings */

		ew32(LEDCTL, hw->ledctl_default);

drivers/net/ethernet/intel/e1000/e1000_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
				EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);

			break;

		}

		/* Fall Through */

		fallthrough;

	default:

		e1000_read_eeprom(hw,

			EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
@@ -3154,7 +3154,6 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, 
				if ((unsigned long)(skb_tail_pointer(skb) - 1)

				    & 4)

					break;

				/* fall through */

				pull_size = min((unsigned int)4, skb->data_len);

				if (!__pskb_pull_tail(skb, pull_size)) {

					e_err(drv, "__pskb_pull_tail "

drivers/net/ethernet/intel/e1000/e1000_param.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter) 
		goto full_duplex_only;

	case SPEED_1000 + HALF_DUPLEX:

		e_dev_info("Half Duplex is not supported at 1000 Mbps\n");

		/* fall through */

		fallthrough;

	case SPEED_1000 + FULL_DUPLEX:

full_duplex_only:

		e_dev_info("Using Autonegotiation at 1000 Mbps Full Duplex "

drivers/net/ethernet/intel/e1000e/82571.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw) 
			ew32(EECD, eecd);

			break;

		}

		/* Fall Through */

		fallthrough;

	default:

		nvm->type = e1000_nvm_eeprom_spi;

		size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
@@ -1107,7 +1107,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 
	switch (mac->type) {

	case e1000_82573:

		e1000e_enable_tx_pkt_filtering(hw);

		/* fall through */

		fallthrough;

	case e1000_82574:

	case e1000_82583:

		reg_data = er32(GCR);

drivers/net/ethernet/intel/e1000e/ethtool.c

+5 −6
Original line number Diff line number Diff line
@@ -893,7 +893,6 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
	case e1000_pch_lpt:

	case e1000_pch_spt:

	case e1000_pch_cnp:

		/* fall through */

	case e1000_pch_tgp:

	case e1000_pch_adp:

		mask |= BIT(18);
@@ -1569,7 +1568,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) 
		/* set bit 29 (value of MULR requests is now 0) */

		tarc0 &= 0xcfffffff;

		ew32(TARC(0), tarc0);

		/* fall through */

		fallthrough;

	case e1000_80003es2lan:

		if (hw->phy.media_type == e1000_media_type_fiber ||

		    hw->phy.media_type == e1000_media_type_internal_serdes) {
@@ -1577,7 +1576,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) 
			ew32(CTRL_EXT, adapter->tx_fifo_head);

			adapter->tx_fifo_head = 0;

		}

		/* fall through */

		fallthrough;

	case e1000_82571:

	case e1000_82572:

		if (hw->phy.media_type == e1000_media_type_fiber ||
@@ -1587,7 +1586,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) 
			usleep_range(10000, 11000);

			break;

		}

		/* Fall Through */

		fallthrough;

	default:

		hw->mac.autoneg = 1;

		if (hw->phy.type == e1000_phy_gg82563)
@@ -2122,7 +2121,7 @@ static int e1000_get_rxnfc(struct net_device *netdev, 
		case TCP_V4_FLOW:

			if (mrqc & E1000_MRQC_RSS_FIELD_IPV4_TCP)

				info->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;

			/* fall through */

			fallthrough;

		case UDP_V4_FLOW:

		case SCTP_V4_FLOW:

		case AH_ESP_V4_FLOW:
@@ -2133,7 +2132,7 @@ static int e1000_get_rxnfc(struct net_device *netdev, 
		case TCP_V6_FLOW:

			if (mrqc & E1000_MRQC_RSS_FIELD_IPV6_TCP)

				info->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;

			/* fall through */

			fallthrough;

		case UDP_V6_FLOW:

		case SCTP_V6_FLOW:

		case AH_ESP_V6_FLOW:

CRA Git | Maintained and supported by SUSTech CRA and CCSE