Browse Source

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).
tags/v0.9.3
Marty Connor 17 years ago
parent
commit
1a867bfb39

+ 12
- 2
src/drivers/net/3c509-eisa.c View File

@@ -15,9 +15,11 @@
15 15
  */
16 16
 static int el3_eisa_probe ( struct nic *nic, struct eisa_device *eisa ) {
17 17
 	
18
-	enable_eisa_device ( eisa );
19
-	eisa_fill_nic ( nic, eisa );
20 18
 
19
+        nic->ioaddr = eisa->ioaddr;
20
+        nic->irqno = 0;
21
+        enable_eisa_device ( eisa );
22
+        
21 23
 	/* Hand off to generic t5x9 probe routine */
22 24
 	return t5x9_probe ( nic, ISA_PROD_ID ( PROD_ID ), ISA_PROD_ID_MASK );
23 25
 }
@@ -37,3 +39,11 @@ DRIVER ( "3c509 (EISA)", nic_driver, eisa_driver, el3_eisa_driver,
37 39
 	 el3_eisa_probe, el3_eisa_disable );
38 40
 
39 41
 ISA_ROM ( "3c509-eisa","3c509 (EISA)" );
42
+
43
+/*
44
+ * Local variables:
45
+ *  c-basic-offset: 8
46
+ *  c-indent-level: 8
47
+ *  tab-width: 8
48
+ * End:
49
+ */

+ 0
- 2
src/drivers/net/3c515.c View File

@@ -614,8 +614,6 @@ static int t515_probe ( struct nic *nic, struct isapnp_device *isapnp ) {
614 614
 
615 615
 	/* Direct copy from Beckers 3c515.c removing any ISAPNP sections */
616 616
 
617
-	isapnp_fill_nic ( nic, isapnp );
618
-
619 617
 	nic->ioaddr = isapnp->ioaddr;
620 618
 	nic->irqno = isapnp->irqno;
621 619
 	activate_isapnp_device ( isapnp );

+ 8
- 1
src/drivers/net/3c529.c View File

@@ -23,7 +23,6 @@
23 23
 static int t529_probe ( struct nic *nic, struct mca_device *mca ) {
24 24
 
25 25
 	/* Retrieve NIC parameters from MCA device parameters */
26
-	mca_fill_nic ( nic, mca );
27 26
 	nic->ioaddr = ( ( mca->pos[4] & 0xfc ) | 0x02 ) << 8;
28 27
 	nic->irqno = mca->pos[5] & 0x0f;
29 28
 	printf ( "3c529 board found on MCA at %#hx IRQ %d -",
@@ -51,3 +50,11 @@ DRIVER ( "3c529", nic_driver, mca_driver, t529_driver,
51 50
 	 t529_probe, t529_disable );
52 51
 
53 52
 ISA_ROM( "3c529", "3c529 == MCA 3c509" );
53
+
54
+/*
55
+ * Local variables:
56
+ *  c-basic-offset: 8
57
+ *  c-indent-level: 8
58
+ *  tab-width: 8
59
+ * End:
60
+ */

+ 2
- 2
src/drivers/net/3c595.c View File

@@ -479,7 +479,6 @@ static int t595_probe ( struct nic *nic, struct pci_device *pci ) {
479 479
 	eth_nic_base = pci->ioaddr;
480 480
 
481 481
 	nic->irqno  = 0;
482
-	pci_fill_nic ( nic, pci );
483 482
 	nic->ioaddr = pci->ioaddr;
484 483
 
485 484
 	GO_WINDOW(0);
@@ -547,6 +546,7 @@ DRIVER ( "3C595", nic_driver, pci_driver, t595_driver,
547 546
 /*
548 547
  * Local variables:
549 548
  *  c-basic-offset: 8
549
+ *  c-indent-level: 8
550
+ *  tab-width: 8
550 551
  * End:
551 552
  */
552
-

+ 8
- 2
src/drivers/net/3c90x.c View File

@@ -713,8 +713,6 @@ static int a3c90x_probe ( struct nic *nic, struct pci_device *pci ) {
713 713
 
714 714
     adjust_pci_device(pci);
715 715
 
716
-    pci_fill_nic ( nic, pci );
717
-
718 716
     nic->ioaddr = pci->ioaddr;
719 717
     nic->irqno = 0;
720 718
 
@@ -1016,3 +1014,11 @@ PCI_DRIVER ( a3c90x_driver, a3c90x_nics, PCI_NO_CLASS );
1016 1014
 
1017 1015
 DRIVER ( "3C90X", nic_driver, pci_driver, a3c90x_driver,
1018 1016
 	 a3c90x_probe, a3c90x_disable );
1017
+
1018
+/*
1019
+ * Local variables:
1020
+ *  c-basic-offset: 8
1021
+ *  c-indent-level: 8
1022
+ *  tab-width: 8
1023
+ * End:
1024
+ */

+ 10
- 1
src/drivers/net/amd8111e.c View File

@@ -653,7 +653,8 @@ static int amd8111e_probe(struct nic *nic, struct pci_device *pdev)
653 653
 	struct amd8111e_priv *lp = &amd8111e;
654 654
 	unsigned long mmio_start, mmio_len;
655 655
 
656
-	pci_fill_nic ( nic, pdev );
656
+        nic->ioaddr = pdev->ioaddr;
657
+        nic->irqno  = pdev->irq;
657 658
 	
658 659
 	mmio_start = pci_bar_start(pdev, PCI_BASE_ADDRESS_0);
659 660
 	mmio_len = pci_bar_size(pdev, PCI_BASE_ADDRESS_0);
@@ -681,3 +682,11 @@ PCI_DRIVER ( amd8111e_driver, amd8111e_nics, PCI_NO_CLASS );
681 682
 
682 683
 DRIVER ( "AMD8111E", nic_driver, pci_driver, amd8111e_driver,
683 684
 	 amd8111e_probe, amd8111e_disable );
685
+
686
+/*
687
+ * Local variables:
688
+ *  c-basic-offset: 8
689
+ *  c-indent-level: 8
690
+ *  tab-width: 8
691
+ * End:
692
+ */

+ 5
- 4
src/drivers/net/cs89x0.c View File

@@ -477,14 +477,12 @@ static int cs89x0_probe_addr ( isa_probe_addr_t ioaddr ) {
477 477
 	return 1;
478 478
 }
479 479
 
480
-static int cs89x0_probe ( struct nic *nic, struct isa_device *isa ) {
480
+static int cs89x0_probe ( struct nic *nic, struct isa_device *isa __unused ) {
481 481
 	int      i, result = -1;
482 482
 	unsigned rev_type = 0, isa_cnf, cs_revision;
483 483
 	unsigned short eeprom_buff[CHKSUM_LEN];
484 484
 
485
-	isa_fill_nic ( nic, isa );
486 485
 	nic->ioaddr &= ~1; /* LSB = 1 indicates a more aggressive probe */
487
-
488 486
 	eth_nic_base = nic->ioaddr;
489 487
 
490 488
 	/* get the chip type */
@@ -552,6 +550,8 @@ static int cs89x0_probe ( struct nic *nic, struct isa_device *isa ) {
552 550
 			else printf("\ncs: BUG: isa_config is %d\n", i); }
553 551
 		eth_irqno = i; }
554 552
 	
553
+        nic->irqno = eth_irqno;
554
+
555 555
 	/* Retrieve and print the ethernet address. */
556 556
 	for (i=0; i<ETH_ALEN; i++) {
557 557
 		nic->node_addr[i] = ((unsigned char *)eeprom_buff)[i];
@@ -712,6 +712,7 @@ ISA_ROM ( "cs89x0", "Crystal Semiconductor CS89x0" );
712 712
 /*
713 713
  * Local variables:
714 714
  *  c-basic-offset: 8
715
+ *  c-indent-level: 8
716
+ *  tab-width: 8
715 717
  * End:
716 718
  */
717
-

+ 10
- 1
src/drivers/net/davicom.c View File

@@ -666,7 +666,8 @@ static int davicom_probe ( struct nic *nic, struct pci_device *pci ) {
666 666
   dev_id  = pci->device;
667 667
   ioaddr  = pci->ioaddr;
668 668
 
669
-  pci_fill_nic ( nic, pci );
669
+  nic->ioaddr = pci->ioaddr;
670
+  nic->irqno = 0;
670 671
 
671 672
   /* wakeup chip */
672 673
   pci_write_config_dword(pci, 0x40, 0x00000000);
@@ -714,3 +715,11 @@ PCI_DRIVER ( davicom_driver, davicom_nics, PCI_NO_CLASS );
714 715
 
715 716
 DRIVER ( "DAVICOM", nic_driver, pci_driver, davicom_driver,
716 717
 	 davicom_probe, davicom_disable );
718
+
719
+/*
720
+ * Local variables:
721
+ *  c-basic-offset: 8
722
+ *  c-indent-level: 8
723
+ *  tab-width: 8
724
+ * End:
725
+ */

+ 8
- 1
src/drivers/net/depca.c View File

@@ -742,7 +742,6 @@ static int depca_probe ( struct nic *nic, struct isa_device *isa ) {
742 742
 	long	sum, chksum;
743 743
 
744 744
 	nic->irqno    = 0;
745
-	isa_fill_nic ( nic, isa );
746 745
 	nic->ioaddr   = isa->ioaddr;
747 746
 
748 747
 	for (i = 0, j = 0, sum = 0; j < 3; j++) {
@@ -794,3 +793,11 @@ DRIVER ( "depce", nic_driver, isa_driver, depca_driver,
794 793
 ISA_ROM ( "depca", "Digital DE100 and DE200" );
795 794
 
796 795
 #endif
796
+
797
+/*
798
+ * Local variables:
799
+ *  c-basic-offset: 8
800
+ *  c-indent-level: 8
801
+ *  tab-width: 8
802
+ * End:
803
+ */

+ 8
- 1
src/drivers/net/dmfe.c View File

@@ -496,7 +496,6 @@ static int dmfe_probe ( struct nic *nic, struct pci_device *pci ) {
496 496
 	dmfe_reset(nic);
497 497
 
498 498
 	nic->irqno  = 0;
499
-	pci_fill_nic ( nic, pci );
500 499
 	nic->ioaddr = pci->ioaddr;
501 500
 
502 501
 	/* point to NIC specific routines */
@@ -1216,3 +1215,11 @@ PCI_DRIVER ( dmfe_driver, dmfe_nics, PCI_NO_CLASS );
1216 1215
 
1217 1216
 DRIVER ( "DMFE/PCI", nic_driver, pci_driver, dmfe_driver,
1218 1217
 	 dmfe_probe, dmfe_disable );
1218
+
1219
+/*
1220
+ * Local variables:
1221
+ *  c-basic-offset: 8
1222
+ *  c-indent-level: 8
1223
+ *  tab-width: 8
1224
+ * End:
1225
+ */

+ 8
- 1
src/drivers/net/eepro.c View File

@@ -562,7 +562,6 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) {
562 562
 	const char *name;
563 563
 
564 564
 	nic->irqno  = 0;
565
-	isa_fill_nic ( nic, isa );
566 565
 	nic->ioaddr = isa->ioaddr;
567 566
 
568 567
 	station_addr.saddr[2] = read_eeprom(nic->ioaddr,2);
@@ -627,3 +626,11 @@ DRIVER ( "eepro", nic_driver, isa_driver, eepro_driver,
627 626
 	 eepro_probe, eepro_disable );
628 627
 
629 628
 ISA_ROM ( "eepro", "Intel Etherexpress Pro/10" );
629
+
630
+/*
631
+ * Local variables:
632
+ *  c-basic-offset: 8
633
+ *  c-indent-level: 8
634
+ *  tab-width: 8
635
+ * End:
636
+ */

+ 16
- 4
src/drivers/net/eepro100.c View File

@@ -599,7 +599,7 @@ static void eepro100_disable ( struct nic *nic __unused ) {
599 599
  *            leaves the 82557 initialized, and ready to recieve packets.
600 600
  */
601 601
 
602
-static int eepro100_probe ( struct nic *nic, struct pci_device *p ) {
602
+static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) {
603 603
 
604 604
 	unsigned short sum = 0;
605 605
 	int i;
@@ -611,10 +611,14 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *p ) {
611 611
 	   be careful not to access beyond this array */
612 612
 	unsigned short eeprom[16];
613 613
 
614
-	if (p->ioaddr == 0)
614
+	if (pci->ioaddr == 0)
615 615
 		return 0;
616
-	pci_fill_nic ( nic, p );
617
-	adjust_pci_device(p);
616
+
617
+	adjust_pci_device(pci);
618
+
619
+        nic->ioaddr = pci->ioaddr;
620
+        nic->irqno = pci->irq;
621
+
618 622
 	ioaddr = nic->ioaddr;
619 623
 
620 624
 	if ((do_eeprom_cmd(EE_READ_CMD << 24, 27) & 0xffe0000)
@@ -834,3 +838,11 @@ PCI_DRIVER ( eepro100_driver, eepro100_nics, PCI_NO_CLASS );
834 838
 
835 839
 DRIVER ( "EEPRO100", nic_driver, pci_driver, eepro100_driver,
836 840
 	 eepro100_probe, eepro100_disable );
841
+
842
+/*
843
+ * Local variables:
844
+ *  c-basic-offset: 8
845
+ *  c-indent-level: 8
846
+ *  tab-width: 8
847
+ * End:
848
+ */

+ 9
- 1
src/drivers/net/epic100.c View File

@@ -120,8 +120,8 @@ epic100_probe ( struct nic *nic, struct pci_device *pci ) {
120 120
        Epic cards in slot order. */
121 121
 
122 122
     ioaddr = pci->ioaddr;
123
+
123 124
     nic->irqno  = 0;
124
-    pci_fill_nic ( nic, pci );
125 125
     nic->ioaddr = pci->ioaddr & ~3;
126 126
 
127 127
     /* compute all used static epic100 registers address */
@@ -525,3 +525,11 @@ PCI_DRIVER ( epic100_driver, epic100_nics, PCI_NO_CLASS );
525 525
 
526 526
 DRIVER ( "EPIC100", nic_driver, pci_driver, epic100_driver,
527 527
 	 epic100_probe, epic100_disable );
528
+
529
+/*
530
+ * Local variables:
531
+ *  c-basic-offset: 8
532
+ *  c-indent-level: 8
533
+ *  tab-width: 8
534
+ * End:
535
+ */

+ 10
- 1
src/drivers/net/forcedeth.c View File

@@ -1248,7 +1248,8 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) {
1248 1248
 	printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n",
1249 1249
 	       pci->driver_name, pci->vendor, pci->device);
1250 1250
 
1251
-	pci_fill_nic ( nic, pci );
1251
+        nic->ioaddr = pci->ioaddr;
1252
+        nic->irqno = 0;
1252 1253
 
1253 1254
 	/* point to private storage */
1254 1255
 	np = &npx;
@@ -1426,3 +1427,11 @@ PCI_DRIVER ( forcedeth_driver, forcedeth_nics, PCI_NO_CLASS );
1426 1427
 
1427 1428
 DRIVER ( "forcedeth", nic_driver, pci_driver, forcedeth_driver,
1428 1429
 	 forcedeth_probe, forcedeth_disable );
1430
+
1431
+/*
1432
+ * Local variables:
1433
+ *  c-basic-offset: 8
1434
+ *  c-indent-level: 8
1435
+ *  tab-width: 8
1436
+ * End:
1437
+ */

+ 3
- 1
src/drivers/net/mtd80x.c View File

@@ -674,9 +674,11 @@ static int mtd_probe ( struct nic *nic, struct pci_device *pci ) {
674 674
     if (pci->ioaddr == 0)
675 675
 	    return 0;
676 676
 
677
-    pci_fill_nic ( nic, pci );
678 677
     adjust_pci_device(pci);
679 678
 
679
+    nic->ioaddr = pci->ioaddr;
680
+    nic->irqno = 0;
681
+
680 682
     mtdx.nic_name = pci->driver_name;
681 683
     mtdx.dev_id = pci->device;
682 684
     mtdx.ioaddr = nic->ioaddr;

+ 8
- 1
src/drivers/net/ns83820.c View File

@@ -837,7 +837,6 @@ static int ns83820_probe ( struct nic *nic, struct pci_device *pci ) {
837 837
 		return 0;
838 838
 
839 839
 	nic->irqno  = 0;
840
-	pci_fill_nic ( nic, pci );
841 840
 	nic->ioaddr = pci->ioaddr & ~3;
842 841
 
843 842
 	/* disable interrupts */
@@ -1003,3 +1002,11 @@ static int ns83820_probe ( struct nic *nic, struct pci_device *pci ) {
1003 1002
 
1004 1003
 DRIVER ( "NS83820/PCI", nic_driver, pci_driver, ns83820_driver,
1005 1004
 	 ns83820_probe, ns83820_disable );
1005
+
1006
+/*
1007
+ * Local variables:
1008
+ *  c-basic-offset: 8
1009
+ *  c-indent-level: 8
1010
+ *  tab-width: 8
1011
+ * End:
1012
+ */

+ 4
- 3
src/drivers/net/ns8390.c View File

@@ -1018,11 +1018,12 @@ DRIVER ( "NE2000/PCI", nic_driver, pci_driver, nepci_driver,
1018 1018
 
1019 1019
 #endif /* INCLUDE_NS8390 */
1020 1020
 
1021
+#endif
1022
+
1021 1023
 /*
1022 1024
  * Local variables:
1023 1025
  *  c-basic-offset: 8
1026
+ *  c-indent-level: 8
1027
+ *  tab-width: 8
1024 1028
  * End:
1025 1029
  */
1026
-
1027
-
1028
-#endif

+ 8
- 1
src/drivers/net/pcnet32.c View File

@@ -681,7 +681,6 @@ static int pcnet32_probe ( struct nic *nic, struct pci_device *pci ) {
681 681
 	       pci->driver_name, pci->vendor, pci->device);
682 682
 
683 683
 	nic->irqno  = 0;
684
-	pci_fill_nic ( nic, pci );
685 684
 	nic->ioaddr = pci->ioaddr & ~3;
686 685
 
687 686
 	/* reset the chip */
@@ -1017,3 +1016,11 @@ PCI_DRIVER ( pcnet32_driver, pcnet32_nics, PCI_NO_CLASS );
1017 1016
 
1018 1017
 DRIVER ( "PCNET32/PCI", nic_driver, pci_driver, pcnet32_driver,
1019 1018
 	 pcnet32_probe, pcnet32_disable );
1019
+
1020
+/*
1021
+ * Local variables:
1022
+ *  c-basic-offset: 8
1023
+ *  c-indent-level: 8
1024
+ *  tab-width: 8
1025
+ * End:
1026
+ */

+ 9
- 1
src/drivers/net/prism2_pci.c View File

@@ -24,12 +24,13 @@ static int prism2_pci_probe ( struct nic *nic, struct pci_device *pci ) {
24 24
   hfa384x_t *hw = &hw_global;
25 25
   uint32_t membase = 0; /* Prism2.5 Memory Base */
26 26
 
27
-  pci_fill_nic ( nic, pci );
28 27
   pci_read_config_dword( pci, PRISM2_PCI_MEM_BASE, &membase);
29 28
   membase &= PCI_BASE_ADDRESS_MEM_MASK;
30 29
   hw->membase = (uint32_t) phys_to_virt(membase);
31 30
   printf ( "Prism2.5 has registers at %#lx\n", hw->membase );
31
+
32 32
   nic->ioaddr = hw->membase;
33
+  nic->irqno = 0;
33 34
 
34 35
   return prism2_probe ( nic, hw );
35 36
 }
@@ -49,3 +50,10 @@ PCI_DRIVER ( prism2_pci_driver, prism2_pci_nics, PCI_NO_CLASS );
49 50
 DRIVER ( "Prism2/PCI", nic_driver, pci_driver, prism2_pci_driver,
50 51
 	 prism2_pci_probe, prism2_pci_disable );
51 52
 
53
+/*
54
+ * Local variables:
55
+ *  c-basic-offset: 8
56
+ *  c-indent-level: 8
57
+ *  tab-width: 8
58
+ * End:
59
+ */

+ 8
- 3
src/drivers/net/prism2_plx.c View File

@@ -81,12 +81,10 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
81 81
 static int prism2_plx_probe ( struct nic *nic, struct pci_device *pci ) {
82 82
   hfa384x_t *hw = &hw_global;
83 83
   
84
-  pci_fill_nic ( nic, pci );
85
-
86 84
   /* Find and intialise PLX Prism2 card */
87 85
   if ( ! prism2_find_plx ( hw, pci ) ) return 0;
88 86
   nic->ioaddr = hw->iobase;
89
-
87
+  nic->irqno  = 0;
90 88
   return prism2_probe ( nic, hw );
91 89
 }
92 90
 
@@ -114,3 +112,10 @@ PCI_DRIVER ( prism2_plx_driver, prism2_plx_nics, PCI_NO_CLASS );
114 112
 DRIVER ( "Prism2/PLX", nic_driver, pci_driver, prism2_plx_driver,
115 113
 	 prism2_plx_probe, prism2_plx_disable );
116 114
 
115
+/*
116
+ * Local variables:
117
+ *  c-basic-offset: 8
118
+ *  c-indent-level: 8
119
+ *  tab-width: 8
120
+ * End:
121
+ */

+ 13
- 4
src/drivers/net/r8169.c View File

@@ -1024,13 +1024,14 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) {
1024 1024
 	}
1025 1025
 
1026 1026
 	r8169_reset(nic);
1027
+
1027 1028
 	/* point to NIC specific routines */
1028
-	nic->nic_op	= &r8169_operations;
1029
-	pci_fill_nic ( nic, pci );
1030
-	nic->irqno = pci->irq;
1029
+	nic->nic_op = &r8169_operations;
1030
+
1031
+	nic->irqno  = pci->irq;
1031 1032
 	nic->ioaddr = ioaddr;
1032
-	return 1;
1033 1033
 
1034
+	return 1;
1034 1035
 }
1035 1036
 
1036 1037
 //======================================================================================================
@@ -1174,3 +1175,11 @@ static void rtl8169_hw_PHY_config(struct nic *nic __unused)
1174 1175
 
1175 1176
 DRIVER ( "r8169/PCI", nic_driver, pci_driver, r8169_driver,
1176 1177
 	 r8169_probe, r8169_disable );
1178
+
1179
+/*
1180
+ * Local variables:
1181
+ *  c-basic-offset: 8
1182
+ *  c-indent-level: 8
1183
+ *  tab-width: 8
1184
+ * End:
1185
+ */

+ 9
- 1
src/drivers/net/sis900.c View File

@@ -344,8 +344,8 @@ static int sis900_probe ( struct nic *nic, struct pci_device *pci ) {
344 344
         return 0;
345 345
 
346 346
     nic->irqno  = 0;
347
-    pci_fill_nic ( nic, pci );
348 347
     nic->ioaddr = pci->ioaddr;
348
+
349 349
     ioaddr  = pci->ioaddr;
350 350
     vendor  = pci->vendor;
351 351
     dev_id  = pci->device;
@@ -1287,3 +1287,11 @@ PCI_DRIVER ( sis900_driver, sis900_nics, PCI_NO_CLASS );
1287 1287
 
1288 1288
 DRIVER ( "SIS900", nic_driver, pci_driver, sis900_driver,
1289 1289
 	 sis900_probe, sis900_disable );
1290
+
1291
+/*
1292
+ * Local variables:
1293
+ *  c-basic-offset: 8
1294
+ *  c-indent-level: 8
1295
+ *  tab-width: 8
1296
+ * End:
1297
+ */

+ 3
- 2
src/drivers/net/smc9000.c View File

@@ -841,7 +841,6 @@ static int smc9000_probe ( struct nic *nic, struct isa_device *isa ) {
841 841
    int              i;
842 842
 
843 843
    nic->irqno  = 0;
844
-   isa_fill_nic ( nic, isa );
845 844
    nic->ioaddr = isa->ioaddr;
846 845
 
847 846
    /*
@@ -947,6 +946,8 @@ ISA_ROM ( "smc9000", "SMC9000" );
947 946
 
948 947
 /*
949 948
  * Local variables:
950
- *  c-basic-offset: 3
949
+ *  c-basic-offset: 8
950
+ *  c-indent-level: 8
951
+ *  tab-width: 8
951 952
  * End:
952 953
  */

+ 10
- 2
src/drivers/net/sundance.c View File

@@ -728,8 +728,8 @@ static int sundance_probe ( struct nic *nic, struct pci_device *pci ) {
728 728
 
729 729
 	/* point to NIC specific routines */
730 730
 	nic->nic_op	= &sundance_operations;
731
-	pci_fill_nic ( nic, pci );
732
-	nic->irqno = pci->irq;
731
+
732
+	nic->irqno  = pci->irq;
733 733
 	nic->ioaddr = BASE;
734 734
 
735 735
 	return 1;
@@ -876,3 +876,11 @@ PCI_DRIVER ( sundance_driver, sundance_nics, PCI_NO_CLASS );
876 876
 
877 877
 DRIVER ( "SUNDANCE/PCI", nic_driver, pci_driver, sundance_driver,
878 878
 	 sundance_probe, sundance_disable );
879
+
880
+/*
881
+ * Local variables:
882
+ *  c-basic-offset: 8
883
+ *  c-indent-level: 8
884
+ *  tab-width: 8
885
+ * End:
886
+ */

+ 9
- 1
src/drivers/net/tg3.c View File

@@ -3242,8 +3242,8 @@ static int tg3_probe ( struct nic *nic, struct pci_device *pdev ) {
3242 3242
 
3243 3243
 	adjust_pci_device(pdev);
3244 3244
 
3245
-	pci_fill_nic ( nic, pdev );
3246 3245
 	nic->irqno  = 0;
3246
+        nic->ioaddr = pdev->ioaddr;
3247 3247
 
3248 3248
 	/* Find power-management capability. */
3249 3249
 	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
@@ -3390,3 +3390,11 @@ PCI_DRIVER ( tg3_driver, tg3_nics, PCI_NO_CLASS );
3390 3390
 
3391 3391
 DRIVER ( "TG3", nic_driver, pci_driver, tg3_driver,
3392 3392
 	 tg3_probe, tg3_disable );
3393
+
3394
+/*
3395
+ * Local variables:
3396
+ *  c-basic-offset: 8
3397
+ *  c-indent-level: 8
3398
+ *  tab-width: 8
3399
+ * End:
3400
+ */

+ 8
- 1
src/drivers/net/tlan.c View File

@@ -784,7 +784,6 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) {
784 784
 		return 0;
785 785
 
786 786
 	nic->irqno  = 0;
787
-	pci_fill_nic ( nic, pci );
788 787
 	nic->ioaddr = pci->ioaddr;
789 788
 
790 789
 	BASE = pci->ioaddr;
@@ -1712,3 +1711,11 @@ PCI_DRIVER ( tlan_driver, tlan_nics, PCI_NO_CLASS );
1712 1711
 
1713 1712
 DRIVER ( "TLAN/PCI", nic_driver, pci_driver, tlan_driver,
1714 1713
 	 tlan_probe, tlan_disable );
1714
+
1715
+/*
1716
+ * Local variables:
1717
+ *  c-basic-offset: 8
1718
+ *  c-indent-level: 8
1719
+ *  tab-width: 8
1720
+ * End:
1721
+ */

+ 8
- 1
src/drivers/net/tulip.c View File

@@ -1243,7 +1243,6 @@ static int tulip_probe ( struct nic *nic, struct pci_device *pci ) {
1243 1243
         return 0;
1244 1244
 
1245 1245
     ioaddr         = pci->ioaddr;
1246
-    pci_fill_nic ( nic, pci );
1247 1246
     nic->ioaddr    = pci->ioaddr & ~3;
1248 1247
     nic->irqno     = 0;
1249 1248
 
@@ -2088,3 +2087,11 @@ PCI_DRIVER ( tulip_driver, tulip_nics, PCI_NO_CLASS );
2088 2087
 
2089 2088
 DRIVER ( "Tulip", nic_driver, pci_driver, tulip_driver,
2090 2089
 	 tulip_probe, tulip_disable );
2090
+
2091
+/*
2092
+ * Local variables:
2093
+ *  c-basic-offset: 8
2094
+ *  c-indent-level: 8
2095
+ *  tab-width: 8
2096
+ * End:
2097
+ */

+ 13
- 1
src/drivers/net/via-rhine.c View File

@@ -966,14 +966,18 @@ rhine_probe ( struct nic *nic, struct pci_device *pci ) {
966 966
 
967 967
     if (!pci->ioaddr)
968 968
 	return 0;
969
+
969 970
     rhine_probe1 (nic, pci, pci->ioaddr, pci->device, -1);
970 971
 
971 972
     adjust_pci_device ( pci );
973
+
972 974
     rhine_reset (nic);
975
+
973 976
     nic->nic_op	= &rhine_operations;
974
-    pci_fill_nic ( nic, pci );
977
+
975 978
     nic->irqno	  = pci->irq;
976 979
     nic->ioaddr   = tp->ioaddr;
980
+
977 981
     return 1;
978 982
 }
979 983
 
@@ -1426,3 +1430,11 @@ DRIVER ( "VIA 86C100", nic_driver, pci_driver, rhine_driver,
1426 1430
 	 rhine_probe, rhine_disable );
1427 1431
 
1428 1432
 /* EOF via-rhine.c */
1433
+
1434
+/*
1435
+ * Local variables:
1436
+ *  c-basic-offset: 8
1437
+ *  c-indent-level: 8
1438
+ *  tab-width: 8
1439
+ * End:
1440
+ */

+ 9
- 2
src/drivers/net/w89c840.c View File

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

Loading…
Cancel
Save