diff options
| author | Johannes Stezenbach <js@linuxtv.org> | 2005-03-28 04:16:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-28 04:16:57 -0800 |
| commit | e9a99b8dab6fb6fdbf367fbdd5f1b59ed2d78b09 (patch) | |
| tree | b6ff4f513732584e4dca80b2f602f63b0ac54c06 | |
| parent | 190a63eee47621edc1c249e997a9e59ea1dca28d (diff) | |
| download | history-e9a99b8dab6fb6fdbf367fbdd5f1b59ed2d78b09.tar.gz | |
[PATCH] dvb: saa7146: static initialization
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/common/saa7146_core.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c index 9acb1bf40ba94..76cdc5481c002 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146_core.c @@ -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 saa7146_extension* ext) { 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 saa7146_extension* ext) 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); |