diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-01-21 16:22:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-07 12:01:09 -0500 |
commit | 102f1a2a496a76f16675ee4bf13e2a5e512c447e (patch) | |
tree | fdbb4ba40a6686300bee29e82a179f815411fd34 | |
parent | 18691f53bcaab1226f22b733189ec9da190bb7a2 (diff) |
staging: don't use module_init in non-modular ion_dummy_driver.c
The ION_DUMMY option is bool, and hence this code is either
present or absent. It will never be modular, so using
module_init as an alias for __initcall is rather misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Colin Cross <ccross@android.com>
Cc: Jesse Barker <jesse.barker@arm.com>
Cc: Android Kernel Team <kernel-team@android.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/android/ion/ion_dummy_driver.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c index f8a7a3244371..df8228b08856 100644 --- a/drivers/staging/android/ion/ion_dummy_driver.c +++ b/drivers/staging/android/ion/ion_dummy_driver.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/init.h> | ||
20 | #include <linux/bootmem.h> | 21 | #include <linux/bootmem.h> |
21 | #include <linux/memblock.h> | 22 | #include <linux/memblock.h> |
22 | #include <linux/sizes.h> | 23 | #include <linux/sizes.h> |
@@ -129,6 +130,7 @@ err: | |||
129 | } | 130 | } |
130 | return err; | 131 | return err; |
131 | } | 132 | } |
133 | device_initcall(ion_dummy_init); | ||
132 | 134 | ||
133 | static void __exit ion_dummy_exit(void) | 135 | static void __exit ion_dummy_exit(void) |
134 | { | 136 | { |
@@ -153,7 +155,4 @@ static void __exit ion_dummy_exit(void) | |||
153 | 155 | ||
154 | return; | 156 | return; |
155 | } | 157 | } |
156 | 158 | __exitcall(ion_dummy_exit); | |
157 | module_init(ion_dummy_init); | ||
158 | module_exit(ion_dummy_exit); | ||
159 | |||