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

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
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
*/ */
static const u16 e1000_gg82563_cable_length_table[] = { static const u16 e1000_gg82563_cable_length_table[] = {
0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF }; 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF };
#define GG82563_CABLE_LENGTH_TABLE_SIZE \ #define GG82563_CABLE_LENGTH_TABLE_SIZE \
ARRAY_SIZE(e1000_gg82563_cable_length_table) ARRAY_SIZE(e1000_gg82563_cable_length_table)
...@@ -1417,4 +1418,3 @@ const struct e1000_info e1000_es2_info = { ...@@ -1417,4 +1418,3 @@ const struct e1000_info e1000_es2_info = {
.phy_ops = &es2_phy_ops, .phy_ops = &es2_phy_ops,
.nvm_ops = &es2_nvm_ops, .nvm_ops = &es2_nvm_ops,
}; };
...@@ -526,6 +526,7 @@ static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw) ...@@ -526,6 +526,7 @@ static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw)
swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI); swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
ew32(SWSM, swsm); ew32(SWSM, swsm);
} }
/** /**
* e1000_get_hw_semaphore_82573 - Acquire hardware semaphore * e1000_get_hw_semaphore_82573 - Acquire hardware semaphore
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
...@@ -2066,4 +2067,3 @@ const struct e1000_info e1000_82583_info = { ...@@ -2066,4 +2067,3 @@ const struct e1000_info e1000_82583_info = {
.phy_ops = &e82_phy_ops_bm, .phy_ops = &e82_phy_ops_bm,
.nvm_ops = &e82571_nvm_ops, .nvm_ops = &e82571_nvm_ops,
}; };
...@@ -244,7 +244,6 @@ ...@@ -244,7 +244,6 @@
#define HALF_DUPLEX 1 #define HALF_DUPLEX 1
#define FULL_DUPLEX 2 #define FULL_DUPLEX 2
#define ADVERTISE_10_HALF 0x0001 #define ADVERTISE_10_HALF 0x0001
#define ADVERTISE_10_FULL 0x0002 #define ADVERTISE_10_FULL 0x0002
#define ADVERTISE_100_HALF 0x0004 #define ADVERTISE_100_HALF 0x0004
......
...@@ -61,7 +61,6 @@ struct e1000_info; ...@@ -61,7 +61,6 @@ struct e1000_info;
#define e_notice(format, arg...) \ #define e_notice(format, arg...) \
netdev_notice(adapter->netdev, format, ## arg) netdev_notice(adapter->netdev, format, ## arg)
/* Interrupt modes, as used by the IntMode parameter */ /* Interrupt modes, as used by the IntMode parameter */
#define E1000E_INT_MODE_LEGACY 0 #define E1000E_INT_MODE_LEGACY 0
#define E1000E_INT_MODE_MSI 1 #define E1000E_INT_MODE_MSI 1
......
...@@ -120,6 +120,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = { ...@@ -120,6 +120,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
"Interrupt test (offline)", "Loopback test (offline)", "Interrupt test (offline)", "Loopback test (offline)",
"Link test (on/offline)" "Link test (on/offline)"
}; };
#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test) #define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
static int e1000_get_settings(struct net_device *netdev, 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, ...@@ -783,6 +784,7 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
} }
return 0; return 0;
} }
#define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write) \ #define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write) \
do { \ do { \
if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \ if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \
......
...@@ -1606,7 +1606,6 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state) ...@@ -1606,7 +1606,6 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
return ret_val; return ret_val;
} }
/** /**
* e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode * e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
...@@ -3517,6 +3516,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) ...@@ -3517,6 +3516,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
return ret_val; return ret_val;
} }
/** /**
* e1000_initialize_hw_bits_ich8lan - Initialize required hardware bits * e1000_initialize_hw_bits_ich8lan - Initialize required hardware bits
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
......
...@@ -1542,7 +1542,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done, ...@@ -1542,7 +1542,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
rx_ring->rx_skb_top = NULL; rx_ring->rx_skb_top = NULL;
goto next_desc; goto next_desc;
} }
#define rxtop (rx_ring->rx_skb_top) #define rxtop (rx_ring->rx_skb_top)
if (!(staterr & E1000_RXD_STAT_EOP)) { if (!(staterr & E1000_RXD_STAT_EOP)) {
/* this descriptor is only the beginning (or middle) */ /* this descriptor is only the beginning (or middle) */
...@@ -1916,7 +1915,6 @@ static irqreturn_t e1000_intr_msix_tx(int __always_unused irq, void *data) ...@@ -1916,7 +1915,6 @@ static irqreturn_t e1000_intr_msix_tx(int __always_unused irq, void *data)
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
struct e1000_ring *tx_ring = adapter->tx_ring; struct e1000_ring *tx_ring = adapter->tx_ring;
adapter->total_tx_bytes = 0; adapter->total_tx_bytes = 0;
adapter->total_tx_packets = 0; adapter->total_tx_packets = 0;
...@@ -4384,6 +4382,7 @@ static int e1000_close(struct net_device *netdev) ...@@ -4384,6 +4382,7 @@ static int e1000_close(struct net_device *netdev)
return 0; return 0;
} }
/** /**
* e1000_set_mac - Change the Ethernet Address of the NIC * e1000_set_mac - Change the Ethernet Address of the NIC
* @netdev: network interface device structure * @netdev: network interface device structure
......
...@@ -38,6 +38,7 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset, ...@@ -38,6 +38,7 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
/* Cable length tables */ /* Cable length tables */
static const u16 e1000_m88_cable_length_table[] = { static const u16 e1000_m88_cable_length_table[] = {
0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED }; 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
#define M88E1000_CABLE_LENGTH_TABLE_SIZE \ #define M88E1000_CABLE_LENGTH_TABLE_SIZE \
ARRAY_SIZE(e1000_m88_cable_length_table) ARRAY_SIZE(e1000_m88_cable_length_table)
...@@ -50,6 +51,7 @@ static const u16 e1000_igp_2_cable_length_table[] = { ...@@ -50,6 +51,7 @@ static const u16 e1000_igp_2_cable_length_table[] = {
87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121, 83, 89, 95, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121, 83, 89, 95,
100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121, 100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121,
124}; 124};
#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \ #define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
ARRAY_SIZE(e1000_igp_2_cable_length_table) ARRAY_SIZE(e1000_igp_2_cable_length_table)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment