diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-10-11 15:47:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 21:12:17 -0700 |
| commit | db1ad33bcfc45bd90994d3855a255e2daf746a3c (patch) | |
| tree | 729477e904133122240a2d202ffe68f20503862a /drivers/staging/android | |
| parent | 12950595906f9879cd0e61da6fa7b1ff6553180b (diff) | |
drivers/staging: make android sw_sync.c explicitly non-modular
The Kconfig currently controlling compilation of this code is:
staging/android/Kconfig:config SW_SYNC
staging/android/Kconfig: bool "Software synchronization objects"
...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 also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.
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/sw_sync.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index 29b5c3567180..c4ff1679ebbc 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -15,11 +15,11 @@ */ #include <linux/kernel.h> +#include <linux/init.h> #include <linux/export.h> #include <linux/file.h> #include <linux/fs.h> #include <linux/miscdevice.h> -#include <linux/module.h> #include <linux/syscalls.h> #include <linux/uaccess.h> @@ -255,13 +255,6 @@ static int __init sw_sync_device_init(void) { return misc_register(&sw_sync_dev); } - -static void __exit sw_sync_device_remove(void) -{ - misc_deregister(&sw_sync_dev); -} - -module_init(sw_sync_device_init); -module_exit(sw_sync_device_remove); +device_initcall(sw_sync_device_init); #endif /* CONFIG_SW_SYNC_USER */ |