Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1244295

[PATCH 2/7] drivers/staging: make android ion_page_pool.c explicitly non-modular

Show all headers | View raw

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>
---
 drivers/staging/android/ion/ion_page_pool.c | 10 ++--------
 1 file 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);
-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] staging: make non-modular code explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-10-12 01:10 +0200
  [PATCH 5/7] drivers/staging: make android lowmemorykiller.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-10-12 01:10 +0200
  [PATCH 1/7] drivers/staging: make android ashmem.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-10-12 01:20 +0200
  [PATCH 7/7] drivers/staging: make emxx_udc.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-10-12 01:20 +0200
  [PATCH 6/7] drivers/staging: make android timed_output.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-10-12 01:20 +0200
  [PATCH 2/7] drivers/staging: make android ion_page_pool.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-10-12 01:20 +0200

csiph-web