patch-2.3.10 linux/drivers/char/hfmodem/main.c

• Lines: 71
• Date: Tue Jul 6 19:16:55 1999
• Orig file: v2.3.9/linux/drivers/char/hfmodem/main.c
• Orig date: Wed May 12 13:27:37 1999

diff -u --recursive --new-file v2.3.9/linux/drivers/char/hfmodem/main.c linux/drivers/char/hfmodem/main.c
@@ -62,7 +62,6 @@
 #if LINUX_VERSION_CODE >= 0x20100
 #include <asm/uaccess.h>
 #else
-#include <asm/segment.h>
 #include <linux/mm.h>
 
 #undef put_user
@@ -160,7 +159,7 @@
 }
 
 /* --------------------------------------------------------------------- */
-__initfunc(static int check_lpt(struct hfmodem_state *dev, unsigned int iobase))
+static int __init check_lpt(struct hfmodem_state *dev, unsigned int iobase)
 {
 	struct parport *pp = parport_enumerate();
 
@@ -179,7 +178,7 @@
 enum uart { c_uart_unknown, c_uart_8250, c_uart_16450, c_uart_16550, c_uart_16550A };
 static const char *uart_str[] __initdata = { "unknown", "8250", "16450", "16550", "16550A" };
 
-__initfunc(static enum uart check_uart(unsigned int iobase))
+static enum uart __init check_uart(unsigned int iobase)
 {
         unsigned char b1,b2,b3;
         enum uart u;
@@ -215,7 +214,7 @@
 
 /* --------------------------------------------------------------------- */
 
-__initfunc(static int check_midi(unsigned int iobase))
+static int __init check_midi(unsigned int iobase)
 {
         unsigned long timeout;
         unsigned long flags;
@@ -263,7 +262,7 @@
 
 /* --------------------------------------------------------------------- */
 
-__initfunc(static void output_check(struct hfmodem_state *dev))
+static void __init output_check(struct hfmodem_state *dev)
 {
         enum uart u = c_uart_unknown;
 
@@ -625,7 +624,7 @@
 
 #endif
 
-__initfunc(int init_module(void))
+int __init init_module(void)
 {
 	int i;
 
@@ -678,7 +677,7 @@
 
 static int hw = 0;
 
-__initfunc(void hfmodem_setup(char *str, int *ints))
+void __init hfmodem_setup(char *str, int *ints)
 {
         if (ints[0] < 7) {
                 printk(KERN_WARNING "%s: setup: too few parameters\n", hfmodem_drvname);
@@ -699,7 +698,7 @@
         hfmodem_refclock_setscale(ints[ints[0]-2], ints[ints[0]-1], ints[ints[0]]);
 }
 
-__initfunc(void hfmodem_init(void))
+void __init hfmodem_init(void)
 {
         int i;