[LV-k25-commit] CVS: kernel-2.5/drivers/net vaxlance.c,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv23516/drivers/net

Modified Files:
	vaxlance.c 
Log Message:
Fix compiler warnings


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/vaxlance.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vaxlance.c	20 May 2002 00:33:36 -0000	1.3
+++ vaxlance.c	23 Jan 2003 23:15:41 -0000	1.4
@@ -33,7 +33,6 @@
 /* Ugly kludge to deal with KA43 weirdness */
 #include <asm/mv.h>
 #include <asm/ka43.h>
-extern struct vax_mv mv_ka43;
 
 #define CRC_POLYNOMIAL_BE 0x04c11db7UL  /* Ethernet CRC, big endian */
 #define CRC_POLYNOMIAL_LE 0xedb88320UL  /* Ethernet CRC, little endian */
@@ -904,7 +903,7 @@
 	static unsigned version_printed = 0;
 	struct lance_private *lp;
 	volatile struct lance_regs *ll;
-	int i, ret;
+	int i;
 	unsigned char *esar;
 
 	/* Could these base addresses be different on other CPUs? */
@@ -940,7 +939,7 @@
 		return -ENOMEM;
 	}
 
-	if (mv == &mv_ka43) {
+	if (is_ka43()) {
 
 		/* FIXME:
 		   We need to check if this block straddles the 16MB boundary.  If
@@ -978,7 +977,7 @@
 	esar=ioremap(esar_phys_addr, 0x80);
 
 	/* prom checks */
-#if 0
+#ifdef CHECK_ADDRESS_ROM_CHECKSUM
 	/* If this is dead code, let's remove it... - KPH 2001-03-04 */
         /* not sure if its dead it might just not work on the VAX I have
            does anyone know if VAX store test pattern in EEPROM */
@@ -986,8 +985,9 @@
 	if (esar[0x60] != 0xff && esar[0x64] != 0x00 &&
 	    esar[0x68] != 0x55 && esar[0x6c] != 0xaa) {
 		printk("Ethernet station address prom not found!\n");
-		ret = -ENODEV;
-		goto err_out;
+		unregister_netdev(dev);
+		kfree(dev);
+		return -ENODEV;
 	}
 	/* Check the prom contents */
 	for (i = 0; i < 8; i++) {
@@ -996,8 +996,9 @@
 		    esar[0x3c - i * 4] != esar[0x40 + i * 4]) {
 			printk("Something is wrong with the ethernet "
 			       "station address prom!\n");
-			ret = -ENODEV;
-			goto err_out;
+			unregister_netdev(dev);
+			kfree(dev);
+			return -ENODEV;
 		}
 	}
 #endif
@@ -1122,11 +1123,6 @@
 #endif
 
 	return 0;
-
-err_out:
-	unregister_netdev(dev);
-	kfree(dev);
-	return ret;
 }