adjust_pci_device(p);
- nic->ioaddr = p->ioaddr & ~3;
- nic->irqno = p->irq;
+ pci_fill_nic ( nic, p );
/* From Matt Hortman <mbhortman@acpthinclient.com> */
/* MAC and Phy settings */
if (p->ioaddr == 0)
return 0;
- ioaddr = p->ioaddr;
- nic->ioaddr = ioaddr;
-
+ pci_fill_nic ( nic, pci );
adjust_pci_device(p);
-
- /* Copy IRQ from PCI information */
- nic->irqno = p->irq;
+ ioaddr = nic->ioaddr;
if ((do_eeprom_cmd(EE_READ_CMD << 24, 27) & 0xffe0000)
== 0xffe0000) {
if (pci->ioaddr == 0)
return 0;
- /* Mask the bit that says "this is an io addr" */
- mtdx.ioaddr = pci->ioaddr;
-
+ pci_fill_nic ( nic, pci );
adjust_pci_device(pci);
mtdx.nic_name = pci->name;
mtdx.dev_id = pci->device_id;
+ mtdx.ioaddr = nic->ioaddr;
/* read ethernet id */
for (i = 0; i < 6; ++i)
static int prism2_plx_probe ( struct nic *nic, struct pci_device *pci ) {
hfa384x_t *hw = &hw_global;
+
+ pci_fill_nic ( nic, pci );
/* Find and intialise PLX Prism2 card */
if ( ! prism2_find_plx ( hw, pci ) ) return 0;
adjust_pci_device(pdev);
+ pci_fill_nic ( nic, pdev );
nic->irqno = 0;
- nic->ioaddr = pdev->ioaddr;
/* Find power-management capability. */
pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
if (p->ioaddr == 0)
return 0;
- ioaddr = p->ioaddr;
- nic->ioaddr = p->ioaddr & ~3;
+ pci_fill_nic ( nic, p );
nic->irqno = 0;