Browse Source

Fix compile warnings, remove unused var

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
b41f754e3a
1 changed files with 2 additions and 6 deletions
  1. 2
    6
      src/drivers/net/ns83820.c

+ 2
- 6
src/drivers/net/ns83820.c View File

@@ -743,8 +743,8 @@ static void ns83820_transmit(struct nic *nic, const char *d,	/* Destination */
743 743
 /**************************************************************************
744 744
 DISABLE - Turn off ethernet interface
745 745
 ***************************************************************************/
746
-static void ns83820_disable ( struct nic *nic, struct pci_device *pci __unused ) {
747
-	nic_disable ( nic );
746
+static void ns83820_disable ( struct nic *nic ) {
747
+
748 748
 	/* put the card in its initial state */
749 749
 	/* This function serves 3 purposes.
750 750
 	 * This disables DMA and interrupts so we don't receive
@@ -814,7 +814,6 @@ PROBE - Look for an adapter, this routine's visible to the outside
814 814
 #define valid_link 0
815 815
 static int ns83820_probe ( struct nic *nic, struct pci_device *pci ) {
816 816
 
817
-	int sz;
818 817
 	long addr;
819 818
 	int using_dac = 0;
820 819
 
@@ -830,10 +829,8 @@ static int ns83820_probe ( struct nic *nic, struct pci_device *pci ) {
830 829
 	adjust_pci_device(pci);
831 830
 
832 831
 	addr = pci_bar_start(pci, PCI_BASE_ADDRESS_1);
833
-	sz = pci_bar_size(pci, PCI_BASE_ADDRESS_1);
834 832
 
835 833
 	ns->base = ioremap(addr, (1UL << 12));
836
-//      ns->base = ioremap(addr, sz);
837 834
 
838 835
 	if (!ns->base)
839 836
 		return 0;
@@ -982,7 +979,6 @@ static int ns83820_probe ( struct nic *nic, struct pci_device *pci ) {
982 979
 	writel(0, ns->base + WCSR);
983 980
 
984 981
 	ns83820_getmac(nic, nic->node_addr);
985
-	printf("%! at ioaddr 0x%hX, ", nic->node_addr, ns->base);
986 982
 
987 983
 	if (using_dac) {
988 984
 		dprintf(("%s: using 64 bit addressing.\n", pci->name));

Loading…
Cancel
Save