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

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

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/opl3sa.c linux/drivers/sound/opl3sa.c
@@ -25,7 +25,6 @@
 #undef  SB_OK
 
 #include "sound_config.h"
-#include "soundmodule.h"
 
 #include "ad1848.h"
 #include "mpu401.h"
@@ -167,7 +166,7 @@
 	int nm = num_mixers;
 
 	/* FIXME */
-	attach_ms_sound(hw_config);
+	attach_ms_sound(hw_config, THIS_MODULE);
 	if (num_mixers > nm)	/* A mixer was installed */
 	{
 		AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD);
@@ -180,7 +179,7 @@
 static void __init attach_opl3sa_mpu(struct address_info *hw_config)
 {
 	hw_config->name = "OPL3-SA (MPU401)";
-	attach_uart401(hw_config);
+	attach_uart401(hw_config, THIS_MODULE);
 }
 
 static int __init probe_opl3sa_mpu(struct address_info *hw_config)
@@ -313,7 +312,7 @@
 	attach_opl3sa_wss(&cfg);
 	if(found_mpu)
 		attach_opl3sa_mpu(&cfg_mpu);
-	SOUND_LOCK;
+
 	return 0;
 }
 
@@ -322,7 +321,6 @@
 	if(found_mpu)
 		unload_opl3sa_mpu(&cfg_mpu);
 	unload_opl3sa_wss(&cfg);
-	SOUND_LOCK_END;
 }
 
 module_init(init_opl3sa);