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

• Lines: 75
• Date: Fri Aug 11 08:26:44 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/softoss.c
• Orig date: Tue Mar 7 14:32:26 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/softoss.c linux/drivers/sound/softoss.c
@@ -32,7 +32,6 @@
 #define NO_SAMPLE		0xffff
 
 #include "sound_config.h"
-#include "soundmodule.h"
 #include "softoss.h"
 #include <linux/ultrasound.h>
 
@@ -1394,27 +1393,28 @@
 
 static struct synth_operations softsyn_operations =
 {
-	"SoftOSS",
-	&softsyn_info,
-	0,
-	SYNTH_TYPE_SAMPLE,
-	0,
-	softsyn_open,
-	softsyn_close,
-	softsyn_ioctl,
-	softsyn_kill_note,
-	softsyn_start_note,
-	softsyn_set_instr,
-	softsyn_reset,
-	softsyn_hw_control,
-	softsyn_load_patch,
-	softsyn_aftertouch,
-	softsyn_controller,
-	softsyn_panning,
-	softsyn_volume_method,
-	softsyn_bender,
-	softsyn_alloc_voice,
-	softsyn_setup_voice
+	owner:		THIS_MODULE,
+	id:		"SoftOSS",
+	info:		&softsyn_info,
+	midi_dev:	0,
+	synth_type:	SYNTH_TYPE_SAMPLE,
+	synth_subtype:	0,
+	open:		softsyn_open,
+	close:		softsyn_close,
+	ioctl:		softsyn_ioctl,
+	kill_note:	softsyn_kill_note,
+	start_note:	softsyn_start_note,
+	set_instr:	softsyn_set_instr,
+	reset:		softsyn_reset,
+	hw_control:	softsyn_hw_control,
+	load_patch:	softsyn_load_patch,
+	aftertouch:	softsyn_aftertouch,
+	controller:	softsyn_controller,
+	panning:	softsyn_panning,
+	volume_method:	softsyn_volume_method,
+	bender:		softsyn_bender,
+	alloc_voice:	softsyn_alloc_voice,
+	setup_voice:	softsyn_setup_voice
 };
 
 /*
@@ -1517,7 +1517,7 @@
 	if (!probe_softsyn(&cfg))
 		return -ENODEV;
 	attach_softsyn_card(&cfg);
-	SOUND_LOCK;
+
 	return 0;
 }
 
@@ -1526,7 +1526,6 @@
 	unload_softsyn(&cfg);
 	sound_unload_synthdev(devc->synthdev);
 	sound_unload_timerdev(devc->timerdev);
-	SOUND_LOCK_END;
 }
 
 module_init(init_softoss);