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

Commit 9005df38 authored by Carolyn Wyborny's avatar Carolyn Wyborny Committed by Jeff Kirsher
Browse files

igb: Cleanups to fix incorrect indentation 



This patch fixes WARNING:LEADING_SPACE, WARNING:SPACING, ERROR:SPACING,
WARNING:SPACE_BEFORE_TAB and ERROR_CODE_INDENT from checkpatch file check.

Signed-off-by: default avatarCarolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d34a15ab

drivers/net/ethernet/intel/igb/e1000_defines.h

+12 −13
Original line number Original line Diff line number Diff line
@@ -1011,8 +1011,7 @@ 
#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F

#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F





/* DMA Coalescing register fields */

/* DMA Coalescing register fields */

#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision based

#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power on DMA coal */

                                                      on DMA coal */





/* Tx Rate-Scheduler Config fields */

/* Tx Rate-Scheduler Config fields */

#define E1000_RTTBCNRC_RS_ENA		0x80000000

#define E1000_RTTBCNRC_RS_ENA		0x80000000

drivers/net/ethernet/intel/igb/e1000_nvm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -480,6 +480,7 @@ s32 igb_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) 
		/* Loop to allow for up to whole page write of eeprom */

		/* Loop to allow for up to whole page write of eeprom */

		while (widx < words) {

		while (widx < words) {

			u16 word_out = data[widx];

			u16 word_out = data[widx];



			word_out = (word_out >> 8) | (word_out << 8);

			word_out = (word_out >> 8) | (word_out << 8);

			igb_shift_out_eec_bits(hw, word_out, 16);

			igb_shift_out_eec_bits(hw, word_out, 16);

			widx++;

			widx++;

drivers/net/ethernet/intel/igb/e1000_regs.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -358,8 +358,7 @@ 
#define E1000_VMBMEM(_n)       (0x00800 + (64 * (_n)))

#define E1000_VMBMEM(_n)       (0x00800 + (64 * (_n)))

#define E1000_VMOLR(_n)        (0x05AD0 + (4 * (_n)))

#define E1000_VMOLR(_n)        (0x05AD0 + (4 * (_n)))

#define E1000_DVMOLR(_n)       (0x0C038 + (64 * (_n)))

#define E1000_DVMOLR(_n)       (0x0C038 + (64 * (_n)))

#define E1000_VLVF(_n)         (0x05D00 + (4 * (_n))) /* VLAN Virtual Machine

#define E1000_VLVF(_n)         (0x05D00 + (4 * (_n))) /* VLAN VM Filter */

                                                       * Filter - RW */

#define E1000_VMVIR(_n)        (0x03700 + (4 * (_n)))

#define E1000_VMVIR(_n)        (0x03700 + (4 * (_n)))





struct e1000_hw;

struct e1000_hw;

drivers/net/ethernet/intel/igb/igb.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -198,6 +198,7 @@ struct igb_tx_buffer { 
	unsigned int bytecount;

	unsigned int bytecount;

	u16 gso_segs;

	u16 gso_segs;

	__be16 protocol;

	__be16 protocol;



	DEFINE_DMA_UNMAP_ADDR(dma);

	DEFINE_DMA_UNMAP_ADDR(dma);

	DEFINE_DMA_UNMAP_LEN(len);

	DEFINE_DMA_UNMAP_LEN(len);

	u32 tx_flags;

	u32 tx_flags;

drivers/net/ethernet/intel/igb/igb_ethtool.c

+11 −9
Original line number Original line Diff line number Diff line
@@ -1218,6 +1218,7 @@ static bool reg_set_and_check(struct igb_adapter *adapter, u64 *data, 
{

{

	struct e1000_hw *hw = &adapter->hw;

	struct e1000_hw *hw = &adapter->hw;

	u32 val;

	u32 val;



	wr32(reg, write & mask);

	wr32(reg, write & mask);

	val = rd32(reg);

	val = rd32(reg);

	if ((write & mask) != (val & mask)) {

	if ((write & mask) != (val & mask)) {
@@ -1949,6 +1950,7 @@ static int igb_link_test(struct igb_adapter *adapter, u64 *data) 
	*data = 0;

	*data = 0;

	if (hw->phy.media_type == e1000_media_type_internal_serdes) {

	if (hw->phy.media_type == e1000_media_type_internal_serdes) {

		int i = 0;

		int i = 0;



		hw->mac.serdes_has_link = false;

		hw->mac.serdes_has_link = false;





		/* On some blade server designs, link establishment

		/* On some blade server designs, link establishment