patch-2.4.0-test12 linux/drivers/net/appletalk/ltpc.c

• Lines: 84
• Date: Sun Dec 3 17:45:22 2000
• Orig file: v2.4.0-test11/linux/drivers/net/appletalk/ltpc.c
• Orig date: Fri Aug 4 18:18:48 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/net/appletalk/ltpc.c linux/drivers/net/appletalk/ltpc.c
@@ -206,11 +206,7 @@
 static int irq=0;
 static int dma=0;
 
-#ifdef MODULE
 #include <linux/module.h>
-#include <linux/version.h>
-#endif
-
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
@@ -710,22 +706,6 @@
 static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev);
 static struct net_device_stats *ltpc_get_stats(struct net_device *dev);
 
-static int ltpc_open(struct net_device *dev)
-{
-#ifdef MODULE
-	MOD_INC_USE_COUNT;
-#endif
-	return 0;
-}
-
-static int ltpc_close(struct net_device *dev)
-{
-#ifdef MODULE
-	MOD_DEC_USE_COUNT;
-#endif
-	return 0;
-}
-
 static int read_30 ( struct net_device *dev)
 {
 	lt_command c;
@@ -921,9 +901,6 @@
 	memset(dev->priv, 0, sizeof(struct ltpc_private));
 	dev->get_stats = ltpc_get_stats;
 
-	dev->open = ltpc_open;
-	dev->stop = ltpc_close;
-
 	/* add the ltpc-specific things */
 	dev->do_ioctl = &ltpc_ioctl;
 
@@ -1008,7 +985,7 @@
 
 /* initialization stuff */
   
-int __init ltpc_probe_dma(int base)
+static int __init ltpc_probe_dma(int base)
 {
 	int dma = 0;
   	int timeout;
@@ -1087,6 +1064,8 @@
 	unsigned long flags;
 	unsigned long f;
 
+	SET_MODULE_OWNER(dev);
+
 	save_flags(flags);
 
 	/* probe for the I/O port address */
@@ -1273,11 +1252,7 @@
 __setup("ltpc=", ltpc_setup);
 #endif /* MODULE */
 
-static struct net_device dev_ltpc = {
-		"", 
-		0, 0, 0, 0,
-	 	0x0, 0,
-	 	0, 0, 0, NULL, ltpc_probe };
+static struct net_device dev_ltpc;
 
 #ifdef MODULE
 MODULE_PARM(debug, "i");
@@ -1295,6 +1270,7 @@
 		       "ltpc: Autoprobing is not recommended for modules\n");
 
 	/* Find a name for this unit */
+	dev_ltpc.init = ltpc_probe;
 	err=dev_alloc_name(&dev_ltpc,"lt%d");
 	
 	if(err<0)