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

Commit f0ff4398 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cleanup CODE_INDENT checkpatch errors 



ERROR:CODE_INDENT: code indent should use tabs where possible

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 39ba22b4

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+38 −35
Original line number Diff line number Diff line
@@ -475,14 +475,14 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, 
		udelay(200);



		ret_val = e1000e_write_phy_reg_mdic(hw,

		                                  MAX_PHY_REG_ADDRESS & offset,

		                                  data);

						    MAX_PHY_REG_ADDRESS &

						    offset, data);



		udelay(200);

	} else {

		ret_val = e1000e_write_phy_reg_mdic(hw,

		                                  MAX_PHY_REG_ADDRESS & offset,

		                                  data);

						    MAX_PHY_REG_ADDRESS &

						    offset, data);

	}



	e1000_release_phy_80003es2lan(hw);
@@ -784,14 +784,14 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) 


	/* Set the transmit descriptor write-back policy */

	reg_data = er32(TXDCTL(0));

	reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |

		   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;

	reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |

		    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);

	ew32(TXDCTL(0), reg_data);



	/* ...for both queues. */

	reg_data = er32(TXDCTL(1));

	reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |

		   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;

	reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |

		    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);

	ew32(TXDCTL(1), reg_data);



	/* Enable retransmit on late collisions */
@@ -818,10 +818,9 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) 
	/* default to true to enable the MDIC W/A */

	hw->dev_spec.e80003es2lan.mdic_wa_enable = true;



	ret_val = e1000_read_kmrn_reg_80003es2lan(hw,

	                              E1000_KMRNCTRLSTA_OFFSET >>

	                              E1000_KMRNCTRLSTA_OFFSET_SHIFT,

	                              &i);

	ret_val =

	    e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET >>

					    E1000_KMRNCTRLSTA_OFFSET_SHIFT, &i);

	if (!ret_val) {

		if ((i & E1000_KMRNCTRLSTA_OPMODE_MASK) ==

		     E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
@@ -1061,13 +1060,15 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw) 
						   reg_data);

	if (ret_val)

		return ret_val;

	ret_val = e1000_read_kmrn_reg_80003es2lan(hw,

	ret_val =

	    e1000_read_kmrn_reg_80003es2lan(hw,

					    E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,

					    &reg_data);

	if (ret_val)

		return ret_val;

	reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING;

	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,

	ret_val =

	    e1000_write_kmrn_reg_80003es2lan(hw,

					     E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,

					     reg_data);

	if (ret_val)
@@ -1125,7 +1126,8 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex) 
	u16 reg_data, reg_data2;



	reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;

	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,

	ret_val =

	    e1000_write_kmrn_reg_80003es2lan(hw,

					     E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,

					     reg_data);

	if (ret_val)
@@ -1171,7 +1173,8 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw) 
	u32 i = 0;



	reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;

	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,

	ret_val =

	    e1000_write_kmrn_reg_80003es2lan(hw,

					     E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,

					     reg_data);

	if (ret_val)

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

+9 −9
Original line number Diff line number Diff line
@@ -846,9 +846,9 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset, 
	}



	for (i = 0; i < words; i++) {

		eewr = (data[i] << E1000_NVM_RW_REG_DATA) |

		eewr = ((data[i] << E1000_NVM_RW_REG_DATA) |

			((offset+i) << E1000_NVM_RW_ADDR_SHIFT) |

		       E1000_NVM_RW_REG_START;

			E1000_NVM_RW_REG_START);



		ret_val = e1000e_poll_eerd_eewr_done(hw, E1000_NVM_POLL_WRITE);

		if (ret_val)
@@ -1122,9 +1122,9 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 


	/* Set the transmit descriptor write-back policy */

	reg_data = er32(TXDCTL(0));

	reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |

	reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |

		    E1000_TXDCTL_FULL_TX_DESC_WB |

		   E1000_TXDCTL_COUNT_DESC;

		    E1000_TXDCTL_COUNT_DESC);

	ew32(TXDCTL(0), reg_data);



	/* ...for both queues. */
@@ -1140,9 +1140,9 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 
		break;

	default:

		reg_data = er32(TXDCTL(1));

		reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |

		reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |

			    E1000_TXDCTL_FULL_TX_DESC_WB |

			   E1000_TXDCTL_COUNT_DESC;

			    E1000_TXDCTL_COUNT_DESC);

		ew32(TXDCTL(1), reg_data);

		break;

	}

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

+17 −20
Original line number Diff line number Diff line
@@ -196,8 +196,7 @@ static int e1000_get_settings(struct net_device *netdev, 
	/* MDI-X => 2; MDI =>1; Invalid =>0 */

	if ((hw->phy.media_type == e1000_media_type_copper) &&

	    netif_carrier_ok(netdev))

		ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X :

		                                      ETH_TP_MDI;

		ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X : ETH_TP_MDI;

	else

		ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;
@@ -297,12 +296,10 @@ static int e1000_set_settings(struct net_device *netdev, 
		hw->mac.autoneg = 1;

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

			hw->phy.autoneg_advertised = ADVERTISED_1000baseT_Full |

						     ADVERTISED_FIBRE |

						     ADVERTISED_Autoneg;

			    ADVERTISED_FIBRE | ADVERTISED_Autoneg;

		else

			hw->phy.autoneg_advertised = ecmd->advertising |

						     ADVERTISED_TP |

						     ADVERTISED_Autoneg;

			    ADVERTISED_TP | ADVERTISED_Autoneg;

		ecmd->advertising = hw->phy.autoneg_advertised;

		if (adapter->fc_autoneg)

			hw->fc.requested_mode = e1000_fc_default;

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

+37 −37
Original line number Diff line number Diff line
@@ -548,8 +548,8 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw) 
	/* find total size of the NVM, then cut in half since the total

	 * size represents two separate NVM banks.

	 */

	nvm->flash_bank_size = (sector_end_addr - sector_base_addr)

				<< FLASH_SECTOR_ADDR_SHIFT;

	nvm->flash_bank_size = ((sector_end_addr - sector_base_addr)

				<< FLASH_SECTOR_ADDR_SHIFT);

	nvm->flash_bank_size /= 2;

	/* Adjust to word count */

	nvm->flash_bank_size /= sizeof(u16);
@@ -1073,9 +1073,9 @@ static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw) 
	u32 fwsm;



	fwsm = er32(FWSM);

	return (fwsm & E1000_ICH_FWSM_FW_VALID) &&

	return ((fwsm & E1000_ICH_FWSM_FW_VALID) &&

		((fwsm & E1000_FWSM_MODE_MASK) ==

		(E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));

		 (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT)));

}



/**
@@ -1440,9 +1440,9 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link) 
			if (ret_val)

				goto release;



			status_reg &= BM_CS_STATUS_LINK_UP |

			status_reg &= (BM_CS_STATUS_LINK_UP |

				       BM_CS_STATUS_RESOLVED |

			              BM_CS_STATUS_SPEED_MASK;

				       BM_CS_STATUS_SPEED_MASK);



			if (status_reg == (BM_CS_STATUS_LINK_UP |

					   BM_CS_STATUS_RESOLVED |
@@ -1455,9 +1455,9 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link) 
			if (ret_val)

				goto release;



			status_reg &= HV_M_STATUS_LINK_UP |

			status_reg &= (HV_M_STATUS_LINK_UP |

				       HV_M_STATUS_AUTONEG_COMPLETE |

			              HV_M_STATUS_SPEED_MASK;

				       HV_M_STATUS_SPEED_MASK);



			if (status_reg == (HV_M_STATUS_LINK_UP |

					   HV_M_STATUS_AUTONEG_COMPLETE |
@@ -2635,8 +2635,8 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, 
	if (size < 1  || size > 2 || offset > ICH_FLASH_LINEAR_ADDR_MASK)

		return -E1000_ERR_NVM;



	flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +

			    hw->nvm.flash_base_addr;

	flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) +

			     hw->nvm.flash_base_addr);



	do {

		udelay(1);
@@ -2989,8 +2989,8 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, 
	    offset > ICH_FLASH_LINEAR_ADDR_MASK)

		return -E1000_ERR_NVM;



	flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +

			    hw->nvm.flash_base_addr;

	flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) +

			     hw->nvm.flash_base_addr);



	do {

		udelay(1);
@@ -3480,16 +3480,16 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) 


	/* Set the transmit descriptor write-back policy for both queues */

	txdctl = er32(TXDCTL(0));

	txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |

		 E1000_TXDCTL_FULL_TX_DESC_WB;

	txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |

		 E1000_TXDCTL_MAX_TX_DESC_PREFETCH;

	txdctl = ((txdctl & ~E1000_TXDCTL_WTHRESH) |

		  E1000_TXDCTL_FULL_TX_DESC_WB);

	txdctl = ((txdctl & ~E1000_TXDCTL_PTHRESH) |

		  E1000_TXDCTL_MAX_TX_DESC_PREFETCH);

	ew32(TXDCTL(0), txdctl);

	txdctl = er32(TXDCTL(1));

	txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |

		 E1000_TXDCTL_FULL_TX_DESC_WB;

	txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |

		 E1000_TXDCTL_MAX_TX_DESC_PREFETCH;

	txdctl = ((txdctl & ~E1000_TXDCTL_WTHRESH) |

		  E1000_TXDCTL_FULL_TX_DESC_WB);

	txdctl = ((txdctl & ~E1000_TXDCTL_PTHRESH) |

		  E1000_TXDCTL_MAX_TX_DESC_PREFETCH);

	ew32(TXDCTL(1), txdctl);



	/* ICH8 has opposite polarity of no_snoop bits.

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

+36 −44
Original line number Diff line number Diff line
@@ -1666,8 +1666,7 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring) 
						 DMA_FROM_DEVICE);

			else if (adapter->clean_rx == e1000_clean_jumbo_rx_irq)

				dma_unmap_page(&pdev->dev, buffer_info->dma,

				               PAGE_SIZE,

					       DMA_FROM_DEVICE);

					       PAGE_SIZE, DMA_FROM_DEVICE);

			else if (adapter->clean_rx == e1000_clean_rx_irq_ps)

				dma_unmap_single(&pdev->dev, buffer_info->dma,

						 adapter->rx_ps_bsize0,
@@ -2578,8 +2577,7 @@ static void e1000_set_itr(struct e1000_adapter *adapter) 
		 * increasing

		 */

		new_itr = new_itr > adapter->itr ?

			     min(adapter->itr + (new_itr >> 2), new_itr) :

			     new_itr;

		    min(adapter->itr + (new_itr >> 2), new_itr) : new_itr;

		adapter->itr = new_itr;

		adapter->rx_ring->itr_val = new_itr;

		if (adapter->msix_entries)
@@ -4616,8 +4614,7 @@ static void e1000e_update_stats(struct e1000_adapter *adapter) 
	 */

	netdev->stats.rx_errors = adapter->stats.rxerrc +

	    adapter->stats.crcerrs + adapter->stats.algnerrc +

		adapter->stats.ruc + adapter->stats.roc +

		adapter->stats.cexterr;

	    adapter->stats.ruc + adapter->stats.roc + adapter->stats.cexterr;

	netdev->stats.rx_length_errors = adapter->stats.ruc +

	    adapter->stats.roc;

	netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
@@ -4625,8 +4622,7 @@ static void e1000e_update_stats(struct e1000_adapter *adapter) 
	netdev->stats.rx_missed_errors = adapter->stats.mpc;



	/* Tx Errors */

	netdev->stats.tx_errors = adapter->stats.ecol +

				       adapter->stats.latecol;

	netdev->stats.tx_errors = adapter->stats.ecol + adapter->stats.latecol;

	netdev->stats.tx_aborted_errors = adapter->stats.ecol;

	netdev->stats.tx_window_errors = adapter->stats.latecol;

	netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
@@ -5142,8 +5138,7 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb) 


	context_desc->lower_setup.ip_config = 0;

	context_desc->upper_setup.tcp_fields.tucss = css;

	context_desc->upper_setup.tcp_fields.tucso =

				css + skb->csum_offset;

	context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;

	context_desc->upper_setup.tcp_fields.tucse = 0;

	context_desc->tcp_seg_setup.data = 0;

	context_desc->cmd_and_length = cpu_to_le32(cmd_len);
@@ -5296,8 +5291,8 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count) 
		buffer_info = &tx_ring->buffer_info[i];

		tx_desc = E1000_TX_DESC(*tx_ring, i);

		tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);

		tx_desc->lower.data =

			cpu_to_le32(txd_lower | buffer_info->length);

		tx_desc->lower.data = cpu_to_le32(txd_lower |

						  buffer_info->length);

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



		i++;
@@ -5598,17 +5593,14 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev, 
	 */

	stats->rx_errors = adapter->stats.rxerrc +

	    adapter->stats.crcerrs + adapter->stats.algnerrc +

		adapter->stats.ruc + adapter->stats.roc +

		adapter->stats.cexterr;

	stats->rx_length_errors = adapter->stats.ruc +

					      adapter->stats.roc;

	    adapter->stats.ruc + adapter->stats.roc + adapter->stats.cexterr;

	stats->rx_length_errors = adapter->stats.ruc + adapter->stats.roc;

	stats->rx_crc_errors = adapter->stats.crcerrs;

	stats->rx_frame_errors = adapter->stats.algnerrc;

	stats->rx_missed_errors = adapter->stats.mpc;



	/* Tx Errors */

	stats->tx_errors = adapter->stats.ecol +

				       adapter->stats.latecol;

	stats->tx_errors = adapter->stats.ecol + adapter->stats.latecol;

	stats->tx_aborted_errors = adapter->stats.ecol;

	stats->tx_window_errors = adapter->stats.latecol;

	stats->tx_carrier_errors = adapter->stats.tncrs;
@@ -6002,8 +5994,7 @@ static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake) 
	pci_set_power_state(pdev, PCI_D3hot);

}



static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,

                                    bool wake)

static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep, bool wake)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -6550,7 +6541,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			err = dma_set_coherent_mask(&pdev->dev,

						    DMA_BIT_MASK(32));

			if (err) {

				dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");

				dev_err(&pdev->dev,

					"No usable DMA configuration, aborting\n");

				goto err_dma;

			}

		}