diff options
author | David Brownell <david-b@pacbell.net> | 2006-10-01 02:28:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:25 -0400 |
commit | 818a8674b0388d90e33a5d1b13946b40dda7032a (patch) | |
tree | 8972d170496e416170fcc0c82bcb634118392e78 | |
parent | 9e86ecb659f11b36b5e189214b19cb31ef5dfd72 (diff) |
[PATCH] RTC class uses subsys_init
This makes RTC core components use "subsys_init" instead of "module_init", as
appropriate for subsystem infrastructure. This is mostly useful for
statically linking drivers in other parts of the tree that may provide an RTC
interface as a secondary functionality (e.g. part of a multifunction chip);
they won't need to worry so much about drivers/Makefile link order.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: Oleg Verych <olecom@flower.upol.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/rtc/class.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-dev.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-proc.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-sysfs.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 1cb61a761cb2..306d600a764a 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
@@ -142,9 +142,9 @@ static void __exit rtc_exit(void) | |||
142 | class_destroy(rtc_class); | 142 | class_destroy(rtc_class); |
143 | } | 143 | } |
144 | 144 | ||
145 | module_init(rtc_init); | 145 | subsys_initcall(rtc_init); |
146 | module_exit(rtc_exit); | 146 | module_exit(rtc_exit); |
147 | 147 | ||
148 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towerteh.it>"); | 148 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); |
149 | MODULE_DESCRIPTION("RTC class support"); | 149 | MODULE_DESCRIPTION("RTC class support"); |
150 | MODULE_LICENSE("GPL"); | 150 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 062c0ab3fe35..629d47cc7e88 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c | |||
@@ -495,7 +495,7 @@ static void __exit rtc_dev_exit(void) | |||
495 | unregister_chrdev_region(rtc_devt, RTC_DEV_MAX); | 495 | unregister_chrdev_region(rtc_devt, RTC_DEV_MAX); |
496 | } | 496 | } |
497 | 497 | ||
498 | module_init(rtc_dev_init); | 498 | subsys_initcall(rtc_dev_init); |
499 | module_exit(rtc_dev_exit); | 499 | module_exit(rtc_dev_exit); |
500 | 500 | ||
501 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); | 501 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); |
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c index cef5f5a3bbf9..1b2c2caa2a99 100644 --- a/drivers/rtc/rtc-proc.c +++ b/drivers/rtc/rtc-proc.c | |||
@@ -156,7 +156,7 @@ static void __exit rtc_proc_exit(void) | |||
156 | class_interface_unregister(&rtc_proc_interface); | 156 | class_interface_unregister(&rtc_proc_interface); |
157 | } | 157 | } |
158 | 158 | ||
159 | module_init(rtc_proc_init); | 159 | subsys_initcall(rtc_proc_init); |
160 | module_exit(rtc_proc_exit); | 160 | module_exit(rtc_proc_exit); |
161 | 161 | ||
162 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); | 162 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); |
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c index 7c1f3d2e53c4..6f8370e88a76 100644 --- a/drivers/rtc/rtc-sysfs.c +++ b/drivers/rtc/rtc-sysfs.c | |||
@@ -116,7 +116,7 @@ static void __exit rtc_sysfs_exit(void) | |||
116 | class_interface_unregister(&rtc_sysfs_interface); | 116 | class_interface_unregister(&rtc_sysfs_interface); |
117 | } | 117 | } |
118 | 118 | ||
119 | module_init(rtc_sysfs_init); | 119 | subsys_init(rtc_sysfs_init); |
120 | module_exit(rtc_sysfs_exit); | 120 | module_exit(rtc_sysfs_exit); |
121 | 121 | ||
122 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); | 122 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); |