Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a48954c8 authored by Janusz Wolak's avatar Janusz Wolak Committed by Jeff Kirsher
Browse files

e1000: Remove checkpatch coding style errors 



Signed-off-by: default avatarJanusz Wolak <januszvdm@gmail.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 73bf8048

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

+7 −9
Original line number Diff line number Diff line
@@ -2193,8 +2193,7 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw) 
			else if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&

				 (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&

				 (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&

				 (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR))

			{

				 (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {

				hw->fc = E1000_FC_TX_PAUSE;

				e_dbg

				    ("Flow Control = TX PAUSE frames only.\n");
@@ -2210,8 +2209,7 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw) 
			else if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&

				 (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&

				 !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&

				 (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR))

			{

				 (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {

				hw->fc = E1000_FC_RX_PAUSE;

				e_dbg

				    ("Flow Control = RX PAUSE frames only.\n");

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

+65 −51
Original line number Diff line number Diff line
@@ -943,8 +943,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct e1000_adapter *adapter;

	struct e1000_hw *hw;



	static int cards_found = 0;

	static int global_quad_port_a = 0; /* global ksp3 port a indication */

	static int cards_found;

	static int global_quad_port_a; /* global ksp3 port a indication */

	int i, err, pci_using_dac;

	u16 eeprom_data = 0;

	u16 tmp = 0;
@@ -2761,7 +2761,9 @@ static int e1000_tso(struct e1000_adapter *adapter, 
		buffer_info->time_stamp = jiffies;

		buffer_info->next_to_watch = i;



		if (++i == tx_ring->count) i = 0;

		if (++i == tx_ring->count)

			i = 0;



		tx_ring->next_to_use = i;



		return true;
@@ -2816,7 +2818,9 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, 
	buffer_info->time_stamp = jiffies;

	buffer_info->next_to_watch = i;



	if (unlikely(++i == tx_ring->count)) i = 0;

	if (unlikely(++i == tx_ring->count))

		i = 0;



	tx_ring->next_to_use = i;



	return true;
@@ -3013,7 +3017,8 @@ static void e1000_tx_queue(struct e1000_adapter *adapter, 
		tx_desc->lower.data =

			cpu_to_le32(txd_lower | buffer_info->length);

		tx_desc->upper.data = cpu_to_le32(txd_upper);

		if (unlikely(++i == tx_ring->count)) i = 0;

		if (unlikely(++i == tx_ring->count))

			i = 0;

	}



	tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
@@ -3869,7 +3874,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, 
			e1000_unmap_and_free_tx_resource(adapter, buffer_info);

			tx_desc->upper.data = 0;



			if (unlikely(++i == tx_ring->count)) i = 0;

			if (unlikely(++i == tx_ring->count))

				i = 0;

		}



		eop = tx_ring->buffer_info[i].next_to_watch;
@@ -3957,9 +3963,11 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err, 
	skb_checksum_none_assert(skb);



	/* 82543 or newer only */

	if (unlikely(hw->mac_type < e1000_82543)) return;

	if (unlikely(hw->mac_type < e1000_82543))

		return;

	/* Ignore Checksum bit is set */

	if (unlikely(status & E1000_RXD_STAT_IXSM)) return;

	if (unlikely(status & E1000_RXD_STAT_IXSM))

		return;

	/* TCP/UDP checksum error bit is set */

	if (unlikely(errors & E1000_RXD_ERR_TCPE)) {

		/* let the stack verify checksum errors */
@@ -4156,7 +4164,9 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, 


		status = rx_desc->status;



		if (++i == rx_ring->count) i = 0;

		if (++i == rx_ring->count)

			i = 0;



		next_rxd = E1000_RX_DESC(*rx_ring, i);

		prefetch(next_rxd);
@@ -4398,7 +4408,9 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, 
			buffer_info->rxbuf.data = NULL;

		}



		if (++i == rx_ring->count) i = 0;

		if (++i == rx_ring->count)

			i = 0;



		next_rxd = E1000_RX_DESC(*rx_ring, i);

		prefetch(next_rxd);
@@ -4686,9 +4698,11 @@ static void e1000_smartspeed(struct e1000_adapter *adapter) 
		 * we assume back-to-back

		 */

		e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);

		if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;

		if (!(phy_status & SR_1000T_MS_CONFIG_FAULT))

			return;

		e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);

		if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;

		if (!(phy_status & SR_1000T_MS_CONFIG_FAULT))

			return;

		e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);

		if (phy_ctrl & CR_1000T_MS_ENABLE) {

			phy_ctrl &= ~CR_1000T_MS_ENABLE;