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/eepro100.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/drivers/net/eepro100.c')

diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index aa99b591..bb46d163 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -599,7 +599,7 @@ static void eepro100_disable ( struct nic *nic __unused ) {
  *            leaves the 82557 initialized, and ready to recieve packets.
  */
 
-static int eepro100_probe ( struct nic *nic, struct pci_device *p ) {
+static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) {
 
 	unsigned short sum = 0;
 	int i;
@@ -611,10 +611,14 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *p ) {
 	   be careful not to access beyond this array */
 	unsigned short eeprom[16];
 
-	if (p->ioaddr == 0)
+	if (pci->ioaddr == 0)
 		return 0;
-	pci_fill_nic ( nic, p );
-	adjust_pci_device(p);
+
+	adjust_pci_device(pci);
+
+        nic->ioaddr = pci->ioaddr;
+        nic->irqno = pci->irq;
+
 	ioaddr = nic->ioaddr;
 
 	if ((do_eeprom_cmd(EE_READ_CMD << 24, 27) & 0xffe0000)
@@ -834,3 +838,11 @@ PCI_DRIVER ( eepro100_driver, eepro100_nics, PCI_NO_CLASS );
 
 DRIVER ( "EEPRO100", nic_driver, pci_driver, eepro100_driver,
 	 eepro100_probe, eepro100_disable );
+
+/*
+ * Local variables:
+ *  c-basic-offset: 8
+ *  c-indent-level: 8
+ *  tab-width: 8
+ * End:
+ */
-- 
cgit v1.2.3-55-g7522