Remove *_fill_nic() calls, and directly set nic->ioaddr and nic->irqno .

This needs to be done manually because if the irq() routine is
implemented then we want something like "nic->irqno = pci->irqno;",
else we do "nic->irqno = 0;" nic->ioaddr may also need to be set
carefully.

Also added local variables to end of many files, for emacs indentation
to match kernel style (tab does 8 space indent).
This commit is contained in:
Marty Connor
2007-12-13 11:08:40 -05:00
parent 9747c1a486
commit 1a867bfb39
29 changed files with 238 additions and 51 deletions

View File

@@ -1024,13 +1024,14 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) {
}
r8169_reset(nic);
/* point to NIC specific routines */
nic->nic_op = &r8169_operations;
pci_fill_nic ( nic, pci );
nic->irqno = pci->irq;
nic->ioaddr = ioaddr;
return 1;
/* point to NIC specific routines */
nic->nic_op = &r8169_operations;
nic->irqno = pci->irq;
nic->ioaddr = ioaddr;
return 1;
}
//======================================================================================================
@@ -1174,3 +1175,11 @@ static void rtl8169_hw_PHY_config(struct nic *nic __unused)
DRIVER ( "r8169/PCI", nic_driver, pci_driver, r8169_driver,
r8169_probe, r8169_disable );
/*
* Local variables:
* c-basic-offset: 8
* c-indent-level: 8
* tab-width: 8
* End:
*/