From: Johannes Stezenbach <js@linuxtv.org>
Static initialization.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/media/common/saa7146_core.c | 29 +---------------------------
1 files changed, 2 insertions(+), 27 deletions(-)
diff -puN drivers/media/common/saa7146_core.c~dvb-saa7146-static-initialization drivers/media/common/saa7146_core.c
--- 25/drivers/media/common/saa7146_core.c~dvb-saa7146-static-initialization 2005-03-21 20:58:02.000000000 -0800
+++ 25-akpm/drivers/media/common/saa7146_core.c 2005-03-21 20:58:02.000000000 -0800
@@ -20,11 +20,9 @@
#include <media/saa7146.h>
-/* global variables */
-struct list_head saa7146_devices;
-struct semaphore saa7146_devices_lock;
+LIST_HEAD(saa7146_devices);
+DECLARE_MUTEX(saa7146_devices_lock);
-static int initialized = 0;
static int saa7146_num = 0;
unsigned int saa7146_debug = 0;
@@ -527,12 +525,6 @@ int saa7146_register_extension(struct sa
{
DEB_EE(("ext:%p\n",ext));
- if( 0 == initialized ) {
- INIT_LIST_HEAD(&saa7146_devices);
- init_MUTEX(&saa7146_devices_lock);
- initialized = 1;
- }
-
ext->driver.name = ext->name;
ext->driver.id_table = ext->pci_tbl;
ext->driver.probe = saa7146_init_one;
@@ -550,23 +542,6 @@ int saa7146_unregister_extension(struct
return 0;
}
-static int __init saa7146_init_module(void)
-{
- if( 0 == initialized ) {
- INIT_LIST_HEAD(&saa7146_devices);
- init_MUTEX(&saa7146_devices_lock);
- initialized = 1;
- }
- return 0;
-}
-
-static void __exit saa7146_cleanup_module(void)
-{
-}
-
-module_init(saa7146_init_module);
-module_exit(saa7146_cleanup_module);
-
EXPORT_SYMBOL_GPL(saa7146_register_extension);
EXPORT_SYMBOL_GPL(saa7146_unregister_extension);
_