diff options
| author | Michael Brown | 2011-02-12 02:11:57 +0100 |
|---|---|---|
| committer | Michael Brown | 2011-02-17 02:25:12 +0100 |
| commit | 5bde349e55640b2d21fbe0f4f53edabe6878eb91 (patch) | |
| tree | 6e99ca19a9ebfe68ddb06f353d06154651d1f635 /src/drivers/net/forcedeth.c | |
| parent | [pci] Replace pci_max_bus() with pci_num_bus() (diff) | |
| download | ipxe-5bde349e55640b2d21fbe0f4f53edabe6878eb91.tar.gz ipxe-5bde349e55640b2d21fbe0f4f53edabe6878eb91.tar.xz ipxe-5bde349e55640b2d21fbe0f4f53edabe6878eb91.zip | |
[pci] Make driver PCI ID a property of the PCI device
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net/forcedeth.c')
| -rw-r--r-- | src/drivers/net/forcedeth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c index 26bbdc8d..3df683ef 100644 --- a/src/drivers/net/forcedeth.c +++ b/src/drivers/net/forcedeth.c @@ -1796,7 +1796,7 @@ err_ioremap: * @ret rc Return status code **/ static int -forcedeth_probe ( struct pci_device *pdev, const struct pci_device_id *ent ) +forcedeth_probe ( struct pci_device *pdev ) { struct net_device *netdev; struct forcedeth_private *priv; @@ -1806,7 +1806,7 @@ forcedeth_probe ( struct pci_device *pdev, const struct pci_device_id *ent ) DBGP ( "forcedeth_probe\n" ); DBG ( "Found %s, vendor = %#04x, device = %#04x\n", - pdev->driver_name, ent->vendor, ent->device ); + pdev->id->name, pdev->id->vendor, pdev->id->device ); /* Allocate our private data */ netdev = alloc_etherdev ( sizeof ( *priv ) ); @@ -1829,7 +1829,7 @@ forcedeth_probe ( struct pci_device *pdev, const struct pci_device_id *ent ) /* We'll need these set up for the rest of the routines */ priv->pci_dev = pdev; priv->netdev = netdev; - priv->driver_data = ent->driver_data; + priv->driver_data = pdev->id->driver_data; adjust_pci_device ( pdev ); |