aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-02-19 23:06:11 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-03-08 04:01:55 -0500
commitfc830b785b08cd8c6974850f78fa9cf221c311a8 (patch)
treef71cb8597e6adede6e303c5e607fd89f93c6f6b3 /drivers/net/ethernet/intel/e1000e
parent53aa82da090222a0eec2956cf9d8409326adca40 (diff)
e1000e: cleanup (add/remove) blank lines where appropriate
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
-rw-r--r--drivers/net/ethernet/intel/e1000e/80003es2lan.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/defines.h1
-rw-r--r--drivers/net/ethernet/intel/e1000e/e1000.h1
-rw-r--r--drivers/net/ethernet/intel/e1000e/ethtool.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/ich8lan.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c3
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c2
8 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index 6c0d96b9889d..d75ace9c9651 100644
--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -38,6 +38,7 @@
38 */ 38 */
39static const u16 e1000_gg82563_cable_length_table[] = { 39static const u16 e1000_gg82563_cable_length_table[] = {
40 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF }; 40 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF };
41
41#define GG82563_CABLE_LENGTH_TABLE_SIZE \ 42#define GG82563_CABLE_LENGTH_TABLE_SIZE \
42 ARRAY_SIZE(e1000_gg82563_cable_length_table) 43 ARRAY_SIZE(e1000_gg82563_cable_length_table)
43 44
@@ -1417,4 +1418,3 @@ const struct e1000_info e1000_es2_info = {
1417 .phy_ops = &es2_phy_ops, 1418 .phy_ops = &es2_phy_ops,
1418 .nvm_ops = &es2_nvm_ops, 1419 .nvm_ops = &es2_nvm_ops,
1419}; 1420};
1420
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 64fc15bd35a6..49341c0eeace 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -526,6 +526,7 @@ static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw)
526 swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI); 526 swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
527 ew32(SWSM, swsm); 527 ew32(SWSM, swsm);
528} 528}
529
529/** 530/**
530 * e1000_get_hw_semaphore_82573 - Acquire hardware semaphore 531 * e1000_get_hw_semaphore_82573 - Acquire hardware semaphore
531 * @hw: pointer to the HW structure 532 * @hw: pointer to the HW structure
@@ -2066,4 +2067,3 @@ const struct e1000_info e1000_82583_info = {
2066 .phy_ops = &e82_phy_ops_bm, 2067 .phy_ops = &e82_phy_ops_bm,
2067 .nvm_ops = &e82571_nvm_ops, 2068 .nvm_ops = &e82571_nvm_ops,
2068}; 2069};
2069
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index 5af602af40d5..e6fe09096c34 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -244,7 +244,6 @@
244#define HALF_DUPLEX 1 244#define HALF_DUPLEX 1
245#define FULL_DUPLEX 2 245#define FULL_DUPLEX 2
246 246
247
248#define ADVERTISE_10_HALF 0x0001 247#define ADVERTISE_10_HALF 0x0001
249#define ADVERTISE_10_FULL 0x0002 248#define ADVERTISE_10_FULL 0x0002
250#define ADVERTISE_100_HALF 0x0004 249#define ADVERTISE_100_HALF 0x0004
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 6ce64ae3e5dd..3ecc9881353f 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -61,7 +61,6 @@ struct e1000_info;
61#define e_notice(format, arg...) \ 61#define e_notice(format, arg...) \
62 netdev_notice(adapter->netdev, format, ## arg) 62 netdev_notice(adapter->netdev, format, ## arg)
63 63
64
65/* Interrupt modes, as used by the IntMode parameter */ 64/* Interrupt modes, as used by the IntMode parameter */
66#define E1000E_INT_MODE_LEGACY 0 65#define E1000E_INT_MODE_LEGACY 0
67#define E1000E_INT_MODE_MSI 1 66#define E1000E_INT_MODE_MSI 1
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 07ef74e7144d..c47dee6be8eb 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -120,6 +120,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
120 "Interrupt test (offline)", "Loopback test (offline)", 120 "Interrupt test (offline)", "Loopback test (offline)",
121 "Link test (on/offline)" 121 "Link test (on/offline)"
122}; 122};
123
123#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test) 124#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
124 125
125static int e1000_get_settings(struct net_device *netdev, 126static 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 } 784 }
784 return 0; 785 return 0;
785} 786}
787
786#define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write) \ 788#define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write) \
787 do { \ 789 do { \
788 if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \ 790 if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index dd67cb6dd3a8..6ff7ff5f2c76 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1606,7 +1606,6 @@ release:
1606 return ret_val; 1606 return ret_val;
1607} 1607}
1608 1608
1609
1610/** 1609/**
1611 * e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode 1610 * e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
1612 * @hw: pointer to the HW structure 1611 * @hw: pointer to the HW structure
@@ -3517,6 +3516,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
3517 3516
3518 return ret_val; 3517 return ret_val;
3519} 3518}
3519
3520/** 3520/**
3521 * e1000_initialize_hw_bits_ich8lan - Initialize required hardware bits 3521 * e1000_initialize_hw_bits_ich8lan - Initialize required hardware bits
3522 * @hw: pointer to the HW structure 3522 * @hw: pointer to the HW structure
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ca1c10e5f69b..172d2e32af32 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1542,7 +1542,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
1542 rx_ring->rx_skb_top = NULL; 1542 rx_ring->rx_skb_top = NULL;
1543 goto next_desc; 1543 goto next_desc;
1544 } 1544 }
1545
1546#define rxtop (rx_ring->rx_skb_top) 1545#define rxtop (rx_ring->rx_skb_top)
1547 if (!(staterr & E1000_RXD_STAT_EOP)) { 1546 if (!(staterr & E1000_RXD_STAT_EOP)) {
1548 /* this descriptor is only the beginning (or middle) */ 1547 /* 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 struct e1000_hw *hw = &adapter->hw; 1915 struct e1000_hw *hw = &adapter->hw;
1917 struct e1000_ring *tx_ring = adapter->tx_ring; 1916 struct e1000_ring *tx_ring = adapter->tx_ring;
1918 1917
1919
1920 adapter->total_tx_bytes = 0; 1918 adapter->total_tx_bytes = 0;
1921 adapter->total_tx_packets = 0; 1919 adapter->total_tx_packets = 0;
1922 1920
@@ -4384,6 +4382,7 @@ static int e1000_close(struct net_device *netdev)
4384 4382
4385 return 0; 4383 return 0;
4386} 4384}
4385
4387/** 4386/**
4388 * e1000_set_mac - Change the Ethernet Address of the NIC 4387 * e1000_set_mac - Change the Ethernet Address of the NIC
4389 * @netdev: network interface device structure 4388 * @netdev: network interface device structure
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 50e84ed3dc86..0a81d1437feb 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -38,6 +38,7 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
38/* Cable length tables */ 38/* Cable length tables */
39static const u16 e1000_m88_cable_length_table[] = { 39static const u16 e1000_m88_cable_length_table[] = {
40 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED }; 40 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
41
41#define M88E1000_CABLE_LENGTH_TABLE_SIZE \ 42#define M88E1000_CABLE_LENGTH_TABLE_SIZE \
42 ARRAY_SIZE(e1000_m88_cable_length_table) 43 ARRAY_SIZE(e1000_m88_cable_length_table)
43 44
@@ -50,6 +51,7 @@ static const u16 e1000_igp_2_cable_length_table[] = {
50 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121, 83, 89, 95, 51 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121, 83, 89, 95,
51 100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121, 52 100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121,
52 124}; 53 124};
54
53#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \ 55#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
54 ARRAY_SIZE(e1000_igp_2_cable_length_table) 56 ARRAY_SIZE(e1000_igp_2_cable_length_table)
55 57