[pci] Make driver PCI ID a property of the PCI device

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2011-02-17 01:25:12 +00:00
parent abb5590b29
commit 5bde349e55
45 changed files with 77 additions and 107 deletions
+1 -2
View File
@@ -276,8 +276,7 @@ extern void e1000e_init_function_pointers_80003es2lan(struct e1000_hw *hw)
extern void e1000e_init_function_pointers_ich8lan(struct e1000_hw *hw)
__attribute__((weak));
extern int e1000e_probe(struct pci_device *pdev,
const struct pci_device_id *id __unused);
extern int e1000e_probe(struct pci_device *pdev);
extern void e1000e_remove(struct pci_device *pdev);
+2 -3
View File
@@ -1005,8 +1005,7 @@ static struct net_device_operations e1000e_operations;
*
* @ret rc Return status code
**/
int e1000e_probe ( struct pci_device *pdev,
const struct pci_device_id *ent)
int e1000e_probe ( struct pci_device *pdev )
{
int i, err;
struct net_device *netdev;
@@ -1014,7 +1013,7 @@ int e1000e_probe ( struct pci_device *pdev,
unsigned long mmio_start, mmio_len;
unsigned long flash_start, flash_len;
struct e1000_hw *hw;
const struct e1000_info *ei = e1000_info_tbl[ent->driver_data];
const struct e1000_info *ei = e1000_info_tbl[pdev->id->driver_data];
DBGP ( "e1000_probe\n" );