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

Groups > linux.kernel > #1244286

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

Show all headers | View raw

The Kconfig currently controlling compilation of this code is:

drivers/staging/android/Kconfig:config ASHMEM
drivers/staging/android/Kconfig:        bool "Enable the Anonymous Shared Memory Subsystem"

...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.

We replace module.h with init.h and export.h ; the latter since this
file uses the global THIS_MODULE.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

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/ashmem.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index f7f8c811af22..3f2a3d611e4b 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -18,7 +18,8 @@
 
 #define pr_fmt(fmt) "ashmem: " fmt
 
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/falloc.h>
@@ -860,19 +861,4 @@ static int __init ashmem_init(void)
 
 	return 0;
 }
-
-static void __exit ashmem_exit(void)
-{
-	unregister_shrinker(&ashmem_shrinker);
-
-	misc_deregister(&ashmem_misc);
-	kmem_cache_destroy(ashmem_range_cachep);
-	kmem_cache_destroy(ashmem_area_cachep);
-
-	pr_info("unloaded\n");
-}
-
-module_init(ashmem_init);
-module_exit(ashmem_exit);
-
-MODULE_LICENSE("GPL");
+device_initcall(ashmem_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 | Next 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