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

• Lines: 49
• Date: Fri Aug 11 08:26:44 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/vidc.c
• Orig date: Mon Jul 10 16:47:25 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/vidc.c linux/drivers/sound/vidc.c
@@ -26,7 +26,6 @@
 #include <asm/system.h>
 
 #include "sound_config.h"
-#include "soundmodule.h"
 #include "vidc.h"
 
 #ifndef _SIOC_TYPE
@@ -362,6 +361,7 @@
 
 static struct audio_driver vidc_audio_driver =
 {
+	owner:			THIS_MODULE,
 	open:			vidc_audio_open,
 	close:			vidc_audio_close,
 	output_block:		vidc_audio_output_block,
@@ -377,6 +377,7 @@
 };
 
 static struct mixer_operations vidc_mixer_operations = {
+	owner:		THIS_MODULE,
 	id:		"VIDC",
 	name:		"VIDCsound",
 	ioctl:		vidc_mixer_ioctl
@@ -519,16 +520,12 @@
 }
 
 static struct address_info cfg;
-/*
- * Note! Module use count is handled by SOUNDLOCK/SOUND_LOCK_END
- */
 
 static int __init init_vidc(void)
 {
 	if (probe_vidc(&cfg) == 0)
 		return -ENODEV;
 
-	SOUND_LOCK;
 	attach_vidc(&cfg);
 
 	return 0;
@@ -537,7 +534,6 @@
 static void __exit cleanup_vidc(void)
 {
 	unload_vidc(&cfg);
-	SOUND_LOCK_END;
 }
 
 module_init(init_vidc);