patch-1.3.39 linux/drivers/net/eepro.c

• Lines: 53
• Date: Thu Nov 9 08:24:06 1995
• Orig file: v1.3.38/linux/drivers/net/eepro.c
• Orig date: Wed Nov 8 07:11:32 1995

diff -u --recursive --new-file v1.3.38/linux/drivers/net/eepro.c linux/drivers/net/eepro.c
@@ -587,9 +587,7 @@
 
 	outb(RCV_ENABLE_CMD, ioaddr);
 
-#ifdef MODULE
 	MOD_INC_USE_COUNT;
-#endif
 	return 0;
 }
 
@@ -756,9 +754,7 @@
 	SLOW_DOWN_IO;
 	SLOW_DOWN_IO; /* May not be enough? */
 
-#ifdef MODULE
 	MOD_DEC_USE_COUNT;
-#endif
 	return 0;
 }
 
@@ -1138,8 +1134,8 @@
 	0, 0,
 	0, 0, 0, NULL, eepro_probe };
 
-int io = 0x200;
-int irq = 0;
+static int io = 0x200;
+static int irq = 0;
 
 int
 init_module(void)
@@ -1157,16 +1153,11 @@
 void
 cleanup_module(void)
 {
-	if (MOD_IN_USE)
-		printk("eepro: device busy, remove delayed\n");
-	else
-	{
-		unregister_netdev(&dev_eepro);
-		kfree_s(dev_eepro.priv,sizeof(struct eepro_local));
-		dev_eepro.priv=NULL;
+	unregister_netdev(&dev_eepro);
+	kfree_s(dev_eepro.priv,sizeof(struct eepro_local));
+	dev_eepro.priv=NULL;
 
-		/* If we don't do this, we can't re-insmod it later. */
-		release_region(dev_eepro.base_addr, EEPRO_IO_EXTENT);
-	}
+	/* If we don't do this, we can't re-insmod it later. */
+	release_region(dev_eepro.base_addr, EEPRO_IO_EXTENT);
 }
 #endif /* MODULE */