patch-2.4.0-test12 linux/drivers/net/hamradio/hdlcdrv.c

• Lines: 44
• Date: Mon Dec 11 13:41:41 2000
• Orig file: v2.4.0-test11/linux/drivers/net/hamradio/hdlcdrv.c
• Orig date: Thu May 4 11:31:21 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/net/hamradio/hdlcdrv.c linux/drivers/net/hamradio/hdlcdrv.c
@@ -287,7 +287,7 @@
 
 /* ---------------------------------------------------------------------- */
 
-static void inline do_kiss_params(struct hdlcdrv_state *s,
+static inline void do_kiss_params(struct hdlcdrv_state *s,
 				  unsigned char *data, unsigned long len)
 {
 
@@ -889,14 +889,7 @@
 
 /* --------------------------------------------------------------------- */
 
-#ifdef MODULE
-
-MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
-MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder");
-
-/* --------------------------------------------------------------------- */
-
-int __init init_module(void)
+static int __init hdlcdrv_init_driver(void)
 {
 	printk(KERN_INFO "hdlcdrv: (C) 1996-2000 Thomas Sailer HB9JNX/AE4WA\n");
 	printk(KERN_INFO "hdlcdrv: version 0.8 compiled " __TIME__ " " __DATE__ "\n");
@@ -905,10 +898,16 @@
 
 /* --------------------------------------------------------------------- */
 
-void cleanup_module(void)
+static void __exit hdlcdrv_cleanup_driver(void)
 {
 	printk(KERN_INFO "hdlcdrv: cleanup\n");
 }
 
-#endif /* MODULE */
+/* --------------------------------------------------------------------- */
+
+MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
+MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder");
+module_init(hdlcdrv_init_driver);
+module_exit(hdlcdrv_cleanup_driver);
+
 /* --------------------------------------------------------------------- */