Commit e20ec73a authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman

drivers/staging: make android timed_output.c explicitly non-modular

The Kconfig currently controlling compilation of this code is:

drivers/staging/android/Kconfig:config ANDROID_TIMED_OUTPUT
drivers/staging/android/Kconfig:        bool "Timed output class driver"

...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 does actually export some symbols.

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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 380b6549
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
#define pr_fmt(fmt) "timed_output: " fmt #define pr_fmt(fmt) "timed_output: " fmt
#include <linux/module.h> #include <linux/init.h>
#include <linux/export.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/fs.h> #include <linux/fs.h>
...@@ -106,15 +107,4 @@ static int __init timed_output_init(void) ...@@ -106,15 +107,4 @@ static int __init timed_output_init(void)
{ {
return create_timed_output_class(); return create_timed_output_class();
} }
device_initcall(timed_output_init);
static void __exit timed_output_exit(void)
{
class_destroy(timed_output_class);
}
module_init(timed_output_init);
module_exit(timed_output_exit);
MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
MODULE_DESCRIPTION("timed output class driver");
MODULE_LICENSE("GPL");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment