aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/82571.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-04-30 21:19:46 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-05-21 05:07:01 -0400
commite80bd1d181ff4601d88cf438817a3a7e84fe6912 (patch)
tree47e323a73f6bdc2d37c1c3466acfb141e298abce /drivers/net/ethernet/intel/e1000e/82571.c
parent5ea94e7686a3aa04cc0d01a2d8bd3d0292b3f592 (diff)
e1000e: cleanup whitespace
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/82571.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 7380442a3829..bef2f103ab03 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -77,24 +77,24 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
77 return 0; 77 return 0;
78 } 78 }
79 79
80 phy->addr = 1; 80 phy->addr = 1;
81 phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT; 81 phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
82 phy->reset_delay_us = 100; 82 phy->reset_delay_us = 100;
83 83
84 phy->ops.power_up = e1000_power_up_phy_copper; 84 phy->ops.power_up = e1000_power_up_phy_copper;
85 phy->ops.power_down = e1000_power_down_phy_copper_82571; 85 phy->ops.power_down = e1000_power_down_phy_copper_82571;
86 86
87 switch (hw->mac.type) { 87 switch (hw->mac.type) {
88 case e1000_82571: 88 case e1000_82571:
89 case e1000_82572: 89 case e1000_82572:
90 phy->type = e1000_phy_igp_2; 90 phy->type = e1000_phy_igp_2;
91 break; 91 break;
92 case e1000_82573: 92 case e1000_82573:
93 phy->type = e1000_phy_m88; 93 phy->type = e1000_phy_m88;
94 break; 94 break;
95 case e1000_82574: 95 case e1000_82574:
96 case e1000_82583: 96 case e1000_82583:
97 phy->type = e1000_phy_bm; 97 phy->type = e1000_phy_bm;
98 phy->ops.acquire = e1000_get_hw_semaphore_82574; 98 phy->ops.acquire = e1000_get_hw_semaphore_82574;
99 phy->ops.release = e1000_put_hw_semaphore_82574; 99 phy->ops.release = e1000_put_hw_semaphore_82574;
100 phy->ops.set_d0_lplu_state = e1000_set_d0_lplu_state_82574; 100 phy->ops.set_d0_lplu_state = e1000_set_d0_lplu_state_82574;
@@ -193,7 +193,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
193 /* EEPROM access above 16k is unsupported */ 193 /* EEPROM access above 16k is unsupported */
194 if (size > 14) 194 if (size > 14)
195 size = 14; 195 size = 14;
196 nvm->word_size = 1 << size; 196 nvm->word_size = 1 << size;
197 break; 197 break;
198 } 198 }
199 199
@@ -339,7 +339,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
339static s32 e1000_get_variants_82571(struct e1000_adapter *adapter) 339static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
340{ 340{
341 struct e1000_hw *hw = &adapter->hw; 341 struct e1000_hw *hw = &adapter->hw;
342 static int global_quad_port_a; /* global port a indication */ 342 static int global_quad_port_a; /* global port a indication */
343 struct pci_dev *pdev = adapter->pdev; 343 struct pci_dev *pdev = adapter->pdev;
344 int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1; 344 int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1;
345 s32 rc; 345 s32 rc;
@@ -1178,7 +1178,7 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
1178 1178
1179 /* Transmit Arbitration Control 0 */ 1179 /* Transmit Arbitration Control 0 */
1180 reg = er32(TARC(0)); 1180 reg = er32(TARC(0));
1181 reg &= ~(0xF << 27); /* 30:27 */ 1181 reg &= ~(0xF << 27); /* 30:27 */
1182 switch (hw->mac.type) { 1182 switch (hw->mac.type) {
1183 case e1000_82571: 1183 case e1000_82571:
1184 case e1000_82572: 1184 case e1000_82572:
@@ -1390,7 +1390,7 @@ bool e1000_check_phy_82574(struct e1000_hw *hw)
1390 ret_val = e1e_rphy(hw, E1000_RECEIVE_ERROR_COUNTER, &receive_errors); 1390 ret_val = e1e_rphy(hw, E1000_RECEIVE_ERROR_COUNTER, &receive_errors);
1391 if (ret_val) 1391 if (ret_val)
1392 return false; 1392 return false;
1393 if (receive_errors == E1000_RECEIVE_ERROR_MAX) { 1393 if (receive_errors == E1000_RECEIVE_ERROR_MAX) {
1394 ret_val = e1e_rphy(hw, E1000_BASE1000T_STATUS, &status_1kbt); 1394 ret_val = e1e_rphy(hw, E1000_BASE1000T_STATUS, &status_1kbt);
1395 if (ret_val) 1395 if (ret_val)
1396 return false; 1396 return false;