diff options
| author | Paul Gortmaker | 2015-10-11 21:47:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-13 06:12:17 +0200 |
| commit | 30d7979259663ce3e0b942498a890a0977a667d6 (patch) | |
| tree | 253224d2d7f7556ac612e4a714673126549f05c1 /drivers/staging/android | |
| parent | Staging: olpc_dcon: Remove braces (diff) | |
| download | kernel-qcow2-linux-30d7979259663ce3e0b942498a890a0977a667d6.tar.gz kernel-qcow2-linux-30d7979259663ce3e0b942498a890a0977a667d6.tar.xz kernel-qcow2-linux-30d7979259663ce3e0b942498a890a0977a667d6.zip | |
drivers/staging: make android ion_page_pool.c explicitly non-modular
The Kconfig currently controlling compilation of this code is:
drivers/staging/android/ion/Kconfig:menuconfig ION
drivers/staging/android/ion/Kconfig: bool "Ion Memory Manager"
...meaning that it currently is not being built as a module by anyone.
Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.
Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Arve Hjønnevåg" <arve@android.com>
Cc: Riley Andrews <riandrews@android.com>
Cc: devel@driverdev.osuosl.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/ion/ion_page_pool.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index 19ad3aba499a..fd7e23e0c06e 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -19,7 +19,7 @@ #include <linux/err.h> #include <linux/fs.h> #include <linux/list.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/slab.h> #include <linux/swap.h> #include "ion_priv.h" @@ -174,10 +174,4 @@ static int __init ion_page_pool_init(void) { return 0; } - -static void __exit ion_page_pool_exit(void) -{ -} - -module_init(ion_page_pool_init); -module_exit(ion_page_pool_exit); +device_initcall(ion_page_pool_init); |