From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
"Paul Gortmaker" <paul.gortmaker@windriver.com>,
"Arve Hjønnevåg" <arve@android.com>,
"Riley Andrews" <riandrews@android.com>,
devel@driverdev.osuosl.org
Subject: [PATCH 1/7] drivers/staging: make android ashmem.c explicitly non-modular
Date: Sun, 11 Oct 2015 19:03:15 -0400 [thread overview]
Message-ID: <1444604601-2896-2-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1444604601-2896-1-git-send-email-paul.gortmaker@windriver.com>
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
next prev parent reply other threads:[~2015-10-11 23:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 23:03 [PATCH 0/7] staging: make non-modular code explicitly non-modular Paul Gortmaker
2015-10-11 23:03 ` Paul Gortmaker [this message]
2015-10-11 23:03 ` [PATCH 2/7] drivers/staging: make android ion_page_pool.c " Paul Gortmaker
2015-10-11 23:03 ` [PATCH 3/7] drivers/staging: make android tegra_ion.c properly tristate Paul Gortmaker
2015-10-11 23:03 ` [PATCH 4/7] drivers/staging: make android sw_sync.c explicitly non-modular Paul Gortmaker
2015-10-11 23:03 ` [PATCH 5/7] drivers/staging: make android lowmemorykiller.c " Paul Gortmaker
2015-10-11 23:03 ` [PATCH 6/7] drivers/staging: make android timed_output.c " Paul Gortmaker
2015-10-11 23:03 ` [PATCH 7/7] drivers/staging: make emxx_udc.c " Paul Gortmaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444604601-2896-2-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=arve@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=riandrews@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox