summaryrefslogtreecommitdiffstats
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/net/mtd80x.c4
-rw-r--r--src/drivers/net/natsemi.c6
-rwxr-xr-xsrc/drivers/net/ns83820.c6
-rw-r--r--src/drivers/net/pcnet32.c4
-rw-r--r--src/drivers/net/r8169.c6
-rw-r--r--src/drivers/net/sundance.c6
-rw-r--r--src/drivers/net/tg3.c6
-rw-r--r--src/drivers/net/tlan.c12
-rw-r--r--src/drivers/net/tulip.c6
-rw-r--r--src/drivers/net/via-rhine.c2
-rw-r--r--src/drivers/net/w89c840.c11
11 files changed, 35 insertions, 34 deletions
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index 2bc2f60c..a06c4d4c 100644
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -687,8 +687,8 @@ static int mtd_probe ( struct nic *nic, struct pci_device *pci ) {
adjust_pci_device(pci);
- mtdx.nic_name = dev->name;
- mtdx.dev_id = pci->dev_id;
+ mtdx.nic_name = pci->name;
+ mtdx.dev_id = pci->device_id;
/* read ethernet id */
for (i = 0; i < 6; ++i)
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index af5e070e..607faaf9 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -261,9 +261,9 @@ natsemi_probe ( struct nic *nic, struct pci_device *pci ) {
nic->ioaddr = pci->ioaddr;
ioaddr = pci->ioaddr;
- vendor = pci->vendor;
- dev_id = pci->dev_id;
- nic_name = dev->name;
+ vendor = pci->vendor_id;
+ dev_id = pci->device_id;
+ nic_name = pci->name;
/* natsemi has a non-standard PM control register
* in PCI config space. Some boards apparently need
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index 6698f4f6..ade11220 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -836,7 +836,7 @@ static int ns83820_probe ( struct nic *nic, struct pci_device *pci ) {
return 0;
printf("ns83820.c: Found %s, vendor=0x%hX, device=0x%hX\n",
- dev->name, pci->vendor, pci->dev_id);
+ pci->name, pci->vendor_id, pci->device_id);
/* point to private storage */
ns = &nsx;
@@ -877,12 +877,12 @@ static int ns83820_probe ( struct nic *nic, struct pci_device *pci ) {
ns->CFG_cache = readl(ns->base + CFG);
if ((ns->CFG_cache & CFG_PCI64_DET)) {
- printf("%s: detected 64 bit PCI data bus.\n", dev->name);
+ printf("%s: detected 64 bit PCI data bus.\n", pci->name);
/*dev->CFG_cache |= CFG_DATA64_EN; */
if (!(ns->CFG_cache & CFG_DATA64_EN))
printf
("%s: EEPROM did not enable 64 bit bus. Disabled.\n",
- dev->name);
+ pci->name);
} else
ns->CFG_cache &= ~(CFG_DATA64_EN);
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index dfc932e6..7b284447 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -682,7 +682,7 @@ static int pcnet32_probe ( struct nic *nic, struct pci_device *pci ) {
/* BASE is used throughout to address the card */
ioaddr = pci->ioaddr;
printf("pcnet32.c: Found %s, Vendor=0x%hX Device=0x%hX\n",
- dev->name, pci->vendor, pci->dev_id);
+ pci->name, pci->vendor_id, pci->device_id);
nic->irqno = 0;
pci_fill_nic ( nic, pci );
@@ -801,7 +801,7 @@ static int pcnet32_probe ( struct nic *nic, struct pci_device *pci ) {
nic->node_addr[i] = promaddr[i];
}
/* Print out some hardware info */
- printf("%s: %! at ioaddr %hX, ", dev->name, nic->node_addr,
+ printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr,
ioaddr);
/* Set to pci bus master */
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index 653489b5..4b02257b 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -731,7 +731,7 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) {
int option = -1, Cap10_100 = 0, Cap1000 = 0;
printf("r8169.c: Found %s, Vendor=%hX Device=%hX\n",
- dev->name, pci->vendor, pci->dev_id);
+ pci->name, pci->vendor_id, pci->device_id);
board_idx++;
@@ -749,7 +749,7 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) {
dprintf(("%s: Identified chip type is '%s'.\n", pci->name,
rtl_chip_info[tpc->chipset].name));
/* Print out some hardware info */
- printf("%s: %! at ioaddr %hX, ", dev->name, nic->node_addr,
+ printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr,
ioaddr);
/* if TBI is not endbled */
@@ -836,7 +836,7 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) {
udelay(100);
printf
("%s: 1000Mbps Full-duplex operation, TBI Link %s!\n",
- dev->name,
+ pci->name,
(RTL_R32(TBICSR) & TBILinkOK) ? "OK" : "Failed");
}
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index fc591ec2..4f2adf2a 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -596,7 +596,7 @@ static int sundance_probe ( struct nic *nic, struct pci_device *pci ) {
/* BASE is used throughout to address the card */
BASE = pci->ioaddr;
printf(" sundance.c: Found %s Vendor=0x%hX Device=0x%hX\n",
- dev->name, pci->vendor, pci->dev_id);
+ pci->name, pci->vendor_id, pci->device_id);
/* Get the MAC Address by reading the EEPROM */
for (i = 0; i < 3; i++) {
@@ -618,13 +618,13 @@ static int sundance_probe ( struct nic *nic, struct pci_device *pci ) {
/* point to private storage */
sdc = &sdx;
- sdc->nic_name = dev->name;
+ sdc->nic_name = pci->name;
sdc->mtu = mtu;
pci_read_config_byte(pci, PCI_REVISION_ID, &sdc->pci_rev_id);
dprintf(("Device revision id: %hx\n", sdc->pci_rev_id));
/* Print out some hardware info */
- printf("%s: %! at ioaddr %hX, ", dev->name, nic->node_addr, BASE);
+ printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr, BASE);
sdc->mii_preamble_required = 0;
if (1) {
int phy, phy_idx = 0;
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index 56423391..b3af6d1d 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -2841,9 +2841,9 @@ static int tg3_get_invariants(struct tg3 *tp)
if (((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) &&
((grc_misc_cfg == 0x8000) || (grc_misc_cfg == 0x4000))) ||
((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
- (tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM) &&
- ((tp->pdev->dev_id == PCI_DEVICE_ID_TIGON3_5901) ||
- (tp->pdev->dev_id == PCI_DEVICE_ID_TIGON3_5901_2)))) {
+ (tp->pdev->vendor_id == PCI_VENDOR_ID_BROADCOM) &&
+ ((tp->pdev->device_id == PCI_DEVICE_ID_TIGON3_5901) ||
+ (tp->pdev->device_id == PCI_DEVICE_ID_TIGON3_5901_2)))) {
tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
}
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index 274e3fa5..b2b34224 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -806,7 +806,7 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) {
i = 0;
chip_idx = -1;
while (tlan_pci_tbl[i].name) {
- if ((((u32) pci->dev_id << 16) | pci->vendor) ==
+ if ((((u32) pci->device_id << 16) | pci->vendor_id) ==
(tlan_pci_tbl[i].id.pci & 0xffffffff)) {
chip_idx = i;
break;
@@ -814,9 +814,9 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) {
i++;
}
- priv->vendor_id = pci->vendor;
- priv->dev_id = pci->dev_id;
- priv->nic_name = dev->name;
+ priv->vendor_id = pci->vendor_id;
+ priv->dev_id = pci->device_id;
+ priv->nic_name = pci->name;
priv->eoc = 0;
err = 0;
@@ -827,11 +827,11 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) {
(u8 *) & nic->node_addr[i]);
if (err) {
printf("TLAN: %s: Error reading MAC from eeprom: %d\n",
- dev->name, err);
+ pci->name, err);
} else
/* Print out some hardware info */
printf("%s: %! at ioaddr %hX, ",
- dev->name, nic->node_addr, pci->ioaddr);
+ pci->name, nic->node_addr, pci->ioaddr);
priv->tlanRev = TLan_DioRead8(BASE, TLAN_DEF_REVISION);
printf("revision: 0x%hX\n", priv->tlanRev);
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 03e039a1..e70ec19a 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -1245,9 +1245,9 @@ static int tulip_probe ( struct nic *nic, struct pci_device *pci ) {
/* point to private storage */
tp = &tpx;
- tp->vendor_id = pci->vendor;
- tp->dev_id = pci->dev_id;
- tp->nic_name = dev->name;
+ tp->vendor_id = pci->vendor_id;
+ tp->dev_id = pci->device_id;
+ tp->nic_name = pci->name;
tp->if_port = 0;
tp->default_port = 0;
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index 591f24aa..aef7cfa5 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -960,7 +960,7 @@ rhine_probe ( struct nic *nic, struct pci_device *pci ) {
if (!pci->ioaddr)
return 0;
- rhine_probe1 (nic, pci, pci->ioaddr, pci->dev_id, -1);
+ rhine_probe1 (nic, pci, pci->ioaddr, pci->device_id, -1);
adjust_pci_device ( pci );
rhine_reset (nic);
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index d3686d5e..73609cc1 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -649,19 +649,20 @@ static int w89c840_probe ( struct nic *nic, struct pci_device *p ) {
#define PCI_DEVICE_ID_COMPEX_RL100ATX 0x2011
/* From Matt Hortman <mbhortman@acpthinclient.com> */
- if (p->vendor == PCI_VENDOR_ID_WINBOND2
- && p->dev_id == PCI_DEVICE_ID_WINBOND2_89C840) {
+ if (p->vendor_id == PCI_VENDOR_ID_WINBOND2
+ && p->device_id == PCI_DEVICE_ID_WINBOND2_89C840) {
/* detected "Winbond W89c840 Fast Ethernet PCI NIC" */
- } else if ( p->vendor == PCI_VENDOR_ID_COMPEX
- && p->dev_id == PCI_DEVICE_ID_COMPEX_RL100ATX) {
+ } else if ( p->vendor_id == PCI_VENDOR_ID_COMPEX
+ && p->device_id == PCI_DEVICE_ID_COMPEX_RL100ATX) {
/* detected "Compex RL100ATX Fast Ethernet PCI NIC" */
} else {
/* Gee, guess what? They missed again. */
- printf("device ID : %X - is not a Compex RL100ATX NIC.\n", p->dev_id);
+ printf("device ID : %X - is not a Compex RL100ATX NIC.\n",
+ p->device_id);
return 0;
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-06 10:18:59 +0200