patch-2.4.0-test7 linux/drivers/sound/waveartist.c

• Lines: 81
• Date: Sun Aug 13 09:54:15 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/waveartist.c
• Orig date: Tue Mar 14 19:10:40 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/waveartist.c linux/drivers/sound/waveartist.c
@@ -40,9 +40,9 @@
 
 #include <asm/dec21285.h>
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/system.h>
 
-#include "soundmodule.h"
 #include "sound_config.h"
 #include "waveartist.h"
 
@@ -801,22 +801,21 @@
 }
 
 static struct audio_driver waveartist_audio_driver = {
-	waveartist_open,
-	waveartist_close,
-	waveartist_output_block,
-	waveartist_start_input,
-	waveartist_ioctl,
-	waveartist_prepare_for_input,
-	waveartist_prepare_for_output,
-	waveartist_halt,
-	NULL,
-	NULL,
-	waveartist_halt_input,
-	waveartist_halt_output,
-	waveartist_trigger,
-	waveartist_set_speed,
-	waveartist_set_bits,
-	waveartist_set_channels
+	owner:		THIS_MODULE,
+	open:		waveartist_open,
+	close:		waveartist_close,
+	output_block:	waveartist_output_block,
+	start_input:	waveartist_start_input,
+	ioctl:		waveartist_ioctl,
+	prepare_for_input:	waveartist_prepare_for_input,
+	prepare_for_output:	waveartist_prepare_for_output,
+	halt_io:	waveartist_halt,
+	halt_input:	waveartist_halt_input,
+	halt_output:	waveartist_halt_output,
+	trigger:	waveartist_trigger,
+	set_speed:	waveartist_set_speed,
+	set_bits:	waveartist_set_bits,
+	set_channels:	waveartist_set_channels
 };
 
 
@@ -1186,9 +1185,10 @@
 
 static struct mixer_operations waveartist_mixer_operations =
 {
-	"WaveArtist",
-	"WaveArtist NetWinder",
-	waveartist_mixer_ioctl
+	owner:	THIS_MODULE,
+	id:	"WaveArtist",
+	name:	"WaveArtist NetWinder",
+	ioctl:	waveartist_mixer_ioctl
 };
 
 static int
@@ -1794,16 +1794,13 @@
 	attach_waveartist(&cfg);
 	attached = 1;
 
-	SOUND_LOCK;
 	return 0;
 }
 
 static void __exit cleanup_waveartist(void)
 {
-	if (attached) {
-		SOUND_LOCK_END;
+	if (attached)
 		unload_waveartist(&cfg);
-	}
 }
 
 module_init(init_waveartist);