From 1a867bfb3949ff4131834cddd491428a056b63ce Mon Sep 17 00:00:00 2001
From: Marty Connor
Date: Thu, 13 Dec 2007 11:08:40 -0500
Subject: 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).
---
 src/drivers/net/via-rhine.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/drivers/net/via-rhine.c')

diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index b96825e6..0c955fab 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -966,14 +966,18 @@ rhine_probe ( struct nic *nic, struct pci_device *pci ) {
 
     if (!pci->ioaddr)
 	return 0;
+
     rhine_probe1 (nic, pci, pci->ioaddr, pci->device, -1);
 
     adjust_pci_device ( pci );
+
     rhine_reset (nic);
+
     nic->nic_op	= &rhine_operations;
-    pci_fill_nic ( nic, pci );
+
     nic->irqno	  = pci->irq;
     nic->ioaddr   = tp->ioaddr;
+
     return 1;
 }
 
@@ -1426,3 +1430,11 @@ DRIVER ( "VIA 86C100", nic_driver, pci_driver, rhine_driver,
 	 rhine_probe, rhine_disable );
 
 /* EOF via-rhine.c */
+
+/*
+ * Local variables:
+ *  c-basic-offset: 8
+ *  c-indent-level: 8
+ *  tab-width: 8
+ * End:
+ */
-- 
cgit v1.2.3-55-g7522