patch-2.4.0-test11 linux/drivers/net/atari_bionet.c

• Lines: 49
• Date: Thu Nov 16 12:51:28 2000
• Orig file: v2.4.0-test10/linux/drivers/net/atari_bionet.c
• Orig date: Fri Jul 14 12:20:22 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/net/atari_bionet.c linux/drivers/net/atari_bionet.c
@@ -353,9 +353,8 @@
 		return -ENODEV;
 	}
 
+	SET_MODULE_OWNER(dev);
 
-	if (dev == NULL)
-		return -ENODEV;
 	if (bionet_debug > 0 && version_printed++ == 0)
 		printk(version);
 
@@ -425,7 +424,6 @@
 	bionet_timer.data = (long)dev;
 	bionet_timer.expires = jiffies + lp->poll_time;
 	add_timer(&bionet_timer);
-	MOD_INC_USE_COUNT;
 	return 0;
 }
 
@@ -629,7 +627,6 @@
 	dev->start = 0;
 
 	stdma_release();
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
@@ -645,19 +642,13 @@
 
 #ifdef MODULE
 
-static char bio_name[16];
-static struct net_device bio_dev =
-	{
-		bio_name,	/* filled in by register_netdev() */
-		0, 0, 0, 0,	/* memory */
-		0, 0,		/* base, irq */
-		0, 0, 0, NULL, bionet_probe,
-	};
+static struct net_device bio_dev;
 
 int
 init_module(void) {
 	int err;
 
+	bio_dev.init = bionet_probe;
 	if ((err = register_netdev(&bio_dev))) {
 		if (err == -EEXIST)  {
 			printk("BIONET: devices already present. Module not loaded.\n");