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

• Lines: 53
• Date: Fri Aug 11 08:26:44 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/trix.c
• Orig date: Thu May 11 15:30:08 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/trix.c linux/drivers/sound/trix.c
@@ -21,7 +21,6 @@
 #include <linux/module.h>
 
 #include "sound_config.h"
-#include "soundmodule.h"
 #include "sb.h"
 #include "sound_firmware.h"
 
@@ -259,7 +258,8 @@
 					  dma1,
 					  dma2,
 					  0,
-					  hw_config->osp);
+					  hw_config->osp,
+					  THIS_MODULE);
 	request_region(hw_config->io_base, 4, "MSS config");
 
 	if (num_mixers > old_num_mixers)	/* Mixer got installed */
@@ -332,7 +332,7 @@
 	old_quiet = sb_be_quiet;
 	sb_be_quiet = 1;
 
-	sb_dsp_init(hw_config);
+	sb_dsp_init(hw_config, THIS_MODULE);
 
 	sb_be_quiet = old_quiet;
 }
@@ -340,7 +340,7 @@
 static void __init attach_trix_mpu(struct address_info *hw_config)
 {
 	hw_config->name = "AudioTrix Pro";
-	attach_uart401(hw_config);
+	attach_uart401(hw_config, THIS_MODULE);
 }
 
 static int __init probe_trix_mpu(struct address_info *hw_config)
@@ -515,7 +515,7 @@
 		if (mpu)
 			attach_trix_mpu(&cfg_mpu);
 	}
-	SOUND_LOCK;
+
 	return 0;
 }
 
@@ -528,7 +528,6 @@
 	if (mpu)
 		unload_trix_mpu(&cfg_mpu);
 	unload_trix_wss(&cfg);
-	SOUND_LOCK_END;
 }
 
 module_init(init_trix);