patch-2.3.10 linux/drivers/sound/wavfront.c

• Lines: 74
• Date: Mon Jul 5 19:58:25 1999
• Orig file: v2.3.9/linux/drivers/sound/wavfront.c
• Orig date: Tue May 11 23:40:50 1999

diff -u --recursive --new-file v2.3.9/linux/drivers/sound/wavfront.c linux/drivers/sound/wavfront.c
@@ -2474,8 +2474,7 @@
 	return (1);
 }
 
-__initfunc (static int detect_wavefront (int irq, int io_base))
-
+static int __init detect_wavefront (int irq, int io_base)
 {
 	unsigned char   rbuf[4], wbuf[4];
 
@@ -2653,8 +2652,7 @@
 	return 1;
 }
 
-__initfunc (static int wavefront_config_midi (void)) 
-
+static int __init wavefront_config_midi (void)
 {
 	unsigned char rbuf[4], wbuf[4];
     
@@ -2728,7 +2726,6 @@
 
 static int
 wavefront_do_reset (int atboot)
-
 {
 	char voices[1];
 
@@ -2832,7 +2829,6 @@
 
 static int
 wavefront_init (int atboot)
-
 {
 	int samples_are_from_rom;
 
@@ -2861,7 +2857,7 @@
 	return (0);
 }
 
-__initfunc (static int install_wavefront (void))
+static int __init install_wavefront (void)
 
 {
 	if ((dev.synth_dev = register_sound_synth (&wavefront_fops, -1)) < 0) {
@@ -2919,7 +2915,7 @@
 #endif OSS_SUPPORT_SEQ
 	uninstall_wf_mpu ();
 }
-
+
 /***********************************************************************/
 /*   WaveFront FX control                                              */
 /***********************************************************************/
@@ -2955,8 +2951,7 @@
 	return (1);
 }
 
-__initfunc (static int detect_wffx (void))
-
+static int __init detect_wffx (void)
 {
 	/* This is a crude check, but its the best one I have for now.
 	   Certainly on the Maui and the Tropez, wffx_idle() will
@@ -2972,8 +2967,7 @@
 	return 0;
 }	
 
-__initfunc (static int attach_wffx (void))
-
+static int __init attach_wffx (void)
 {
 	if ((dev.fx_mididev = sound_alloc_mididev ()) < 0) {
 		printk (KERN_WARNING LOGNAME "cannot install FX Midi driver\n");