Skip to content

Commit

Permalink
e1000: remove unused part_num reading code
Browse files Browse the repository at this point in the history
Remove the code that reads part_num from the EEPROM. This part number
is never displayed or queryable by the user.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
  • Loading branch information
Auke Kok authored and Auke Kok committed Aug 28, 2006
1 parent 3d1dd8c commit e7b4411
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 37 deletions.
1 change: 0 additions & 1 deletion drivers/net/e1000/e1000.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ struct e1000_adapter {
uint16_t mng_vlan_id;
uint32_t bd_number;
uint32_t rx_buffer_len;
uint32_t part_num;
uint32_t wol;
uint32_t ksp3_port_a;
uint32_t smartspeed;
Expand Down
34 changes: 0 additions & 34 deletions drivers/net/e1000/e1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -5555,40 +5555,6 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
return error;
}

/******************************************************************************
* Reads the adapter's part number from the EEPROM
*
* hw - Struct containing variables accessed by shared code
* part_num - Adapter's part number
*****************************************************************************/
int32_t
e1000_read_part_num(struct e1000_hw *hw,
uint32_t *part_num)
{
uint16_t offset = EEPROM_PBA_BYTE_1;
uint16_t eeprom_data;

DEBUGFUNC("e1000_read_part_num");

/* Get word 0 from EEPROM */
if (e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
DEBUGOUT("EEPROM Read Error\n");
return -E1000_ERR_EEPROM;
}
/* Save word 0 in upper half of part_num */
*part_num = (uint32_t) (eeprom_data << 16);

/* Get word 1 from EEPROM */
if (e1000_read_eeprom(hw, ++offset, 1, &eeprom_data) < 0) {
DEBUGOUT("EEPROM Read Error\n");
return -E1000_ERR_EEPROM;
}
/* Save word 1 in lower half of part_num */
*part_num |= eeprom_data;

return E1000_SUCCESS;
}

/******************************************************************************
* Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
* second function of dual function devices
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -853,8 +853,6 @@ e1000_probe(struct pci_dev *pdev,
goto err_eeprom;
}

e1000_read_part_num(&adapter->hw, &(adapter->part_num));

e1000_get_bus_info(&adapter->hw);

init_timer(&adapter->tx_fifo_stall_timer);
Expand Down

0 comments on commit e7b4411

Please sign in to comment.