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

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

e1000e: cleanup (add/remove) blank lines where appropriate 



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 53aa82da

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

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
 */

static const u16 e1000_gg82563_cable_length_table[] = {

	 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF };



#define GG82563_CABLE_LENGTH_TABLE_SIZE \

		ARRAY_SIZE(e1000_gg82563_cable_length_table)
@@ -1417,4 +1418,3 @@ const struct e1000_info e1000_es2_info = { 
	.phy_ops		= &es2_phy_ops,

	.nvm_ops		= &es2_nvm_ops,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw) 
	swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);

	ew32(SWSM, swsm);

}



/**

 *  e1000_get_hw_semaphore_82573 - Acquire hardware semaphore

 *  @hw: pointer to the HW structure
@@ -2066,4 +2067,3 @@ const struct e1000_info e1000_82583_info = { 
	.phy_ops		= &e82_phy_ops_bm,

	.nvm_ops		= &e82571_nvm_ops,

};

drivers/net/ethernet/intel/e1000e/defines.h

+0 −1
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ 
#define HALF_DUPLEX 1

#define FULL_DUPLEX 2





#define ADVERTISE_10_HALF                 0x0001

#define ADVERTISE_10_FULL                 0x0002

#define ADVERTISE_100_HALF                0x0004

drivers/net/ethernet/intel/e1000e/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct e1000_info; 
#define e_notice(format, arg...) \

	netdev_notice(adapter->netdev, format, ## arg)





/* Interrupt modes, as used by the IntMode parameter */

#define E1000E_INT_MODE_LEGACY		0

#define E1000E_INT_MODE_MSI		1

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

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = { 
	"Interrupt test (offline)", "Loopback test  (offline)",

	"Link test   (on/offline)"

};



#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)



static int e1000_get_settings(struct net_device *netdev,
@@ -783,6 +784,7 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, 
	}

	return 0;

}



#define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write)                       \

	do {                                                                   \

		if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \