aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000.h1
-rw-r--r--drivers/net/e1000/e1000_hw.c34
-rw-r--r--drivers/net/e1000/e1000_main.c2
3 files changed, 0 insertions, 37 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index c1107815f22c..70ba3783ad80 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -245,7 +245,6 @@ struct e1000_adapter {
245 uint16_t mng_vlan_id; 245 uint16_t mng_vlan_id;
246 uint32_t bd_number; 246 uint32_t bd_number;
247 uint32_t rx_buffer_len; 247 uint32_t rx_buffer_len;
248 uint32_t part_num;
249 uint32_t wol; 248 uint32_t wol;
250 uint32_t ksp3_port_a; 249 uint32_t ksp3_port_a;
251 uint32_t smartspeed; 250 uint32_t smartspeed;
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 57749eb438e4..f56d4cd6701d 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -5556,40 +5556,6 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
5556} 5556}
5557 5557
5558/****************************************************************************** 5558/******************************************************************************
5559 * Reads the adapter's part number from the EEPROM
5560 *
5561 * hw - Struct containing variables accessed by shared code
5562 * part_num - Adapter's part number
5563 *****************************************************************************/
5564int32_t
5565e1000_read_part_num(struct e1000_hw *hw,
5566 uint32_t *part_num)
5567{
5568 uint16_t offset = EEPROM_PBA_BYTE_1;
5569 uint16_t eeprom_data;
5570
5571 DEBUGFUNC("e1000_read_part_num");
5572
5573 /* Get word 0 from EEPROM */
5574 if (e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
5575 DEBUGOUT("EEPROM Read Error\n");
5576 return -E1000_ERR_EEPROM;
5577 }
5578 /* Save word 0 in upper half of part_num */
5579 *part_num = (uint32_t) (eeprom_data << 16);
5580
5581 /* Get word 1 from EEPROM */
5582 if (e1000_read_eeprom(hw, ++offset, 1, &eeprom_data) < 0) {
5583 DEBUGOUT("EEPROM Read Error\n");
5584 return -E1000_ERR_EEPROM;
5585 }
5586 /* Save word 1 in lower half of part_num */
5587 *part_num |= eeprom_data;
5588
5589 return E1000_SUCCESS;
5590}
5591
5592/******************************************************************************
5593 * Reads the adapter's MAC address from the EEPROM and inverts the LSB for the 5559 * Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
5594 * second function of dual function devices 5560 * second function of dual function devices
5595 * 5561 *
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 630fe605e5c4..c128f62fa45e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -853,8 +853,6 @@ e1000_probe(struct pci_dev *pdev,
853 goto err_eeprom; 853 goto err_eeprom;
854 } 854 }
855 855
856 e1000_read_part_num(&adapter->hw, &(adapter->part_num));
857
858 e1000_get_bus_info(&adapter->hw); 856 e1000_get_bus_info(&adapter->hw);
859 857
860 init_timer(&adapter->tx_fifo_stall_timer); 858 init_timer(&adapter->tx_fifo_stall_timer);