Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Paul Gortmaker and committed by
Greg Kroah-Hartman
db1ad33b 12950595

+2 -9
+2 -9
drivers/staging/android/sw_sync.c
··· 15 15 */ 16 16 17 17 #include <linux/kernel.h> 18 + #include <linux/init.h> 18 19 #include <linux/export.h> 19 20 #include <linux/file.h> 20 21 #include <linux/fs.h> 21 22 #include <linux/miscdevice.h> 22 - #include <linux/module.h> 23 23 #include <linux/syscalls.h> 24 24 #include <linux/uaccess.h> 25 25 ··· 255 255 { 256 256 return misc_register(&sw_sync_dev); 257 257 } 258 - 259 - static void __exit sw_sync_device_remove(void) 260 - { 261 - misc_deregister(&sw_sync_dev); 262 - } 263 - 264 - module_init(sw_sync_device_init); 265 - module_exit(sw_sync_device_remove); 258 + device_initcall(sw_sync_device_init); 266 259 267 260 #endif /* CONFIG_SW_SYNC_USER */