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

@@ -630,10 +630,9 @@ static int w89c840_probe ( struct nic *nic, struct pci_device *p ) {
if (p->ioaddr == 0)
return 0;
pci_fill_nic ( nic, p );
nic->ioaddr = p->ioaddr;
nic->irqno = 0;
#if defined(W89C840_DEBUG)
printf("winbond-840: PCI bus %hhX device function %hhX: I/O address: %hX\n", p->bus, p->devfn, ioaddr);
#endif
@@ -954,3 +953,11 @@ static void init_ring(void)
DRIVER ( "W89C840F", nic_driver, pci_driver, w89c840_driver,
w89c840_probe, w89c840_disable );
/*
* Local variables:
* c-basic-offset: 8
* c-indent-level: 8
* tab-width: 8
* End:
*/