samples: mark {static|__init|__exit} for {init|exit} functions

None of these (init|exit) functions is called from other functions which
is outside the kernel module mechanism or kernel itself, so mark them as
{static|__init|__exit}.

Signed-off-by: Qinghuang Feng <qhfeng.kernel@gmail.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/samples/firmware_class/firmware_sample_driver.c b/samples/firmware_class/firmware_sample_driver.c
index 11114f389c4958213f9c8e9a8b08209204885f4e..219a298966034b2a02236ee305e29dcdcf910d72 100644 (file)
--- a/samples/firmware_class/firmware_sample_driver.c
+++ b/samples/firmware_class/firmware_sample_driver.c
@@ -100,7 +100,7 @@ static void sample_probe_async(void)
                       " request_firmware_nowait failed\n");
 }
 
-static int sample_init(void)
+static int __init sample_init(void)
 {
        device_initialize(&ghost_device);
        /* since there is no real hardware insertion I just call the

diff --git a/samples/kobject/kobject-example.c b/samples/kobject/kobject-example.c
index 08d0d3ff326383510f30baaa4db632e665da64b9..8d9b55a1202372a3d63494ac7babf4d752a8969e 100644 (file)
--- a/samples/kobject/kobject-example.c
+++ b/samples/kobject/kobject-example.c
@@ -101,7 +101,7 @@ static struct attribute_group attr_group = {
 
 static struct kobject *example_kobj;
 
-static int example_init(void)
+static int __init example_init(void)
 {
        int retval;
 
@@ -126,7 +126,7 @@ static int example_init(void)
        return retval;
 }
 
-static void example_exit(void)
+static void __exit example_exit(void)
 {
        kobject_put(example_kobj);
 }

diff --git a/samples/kobject/kset-example.c b/samples/kobject/kset-example.c
index 7395c0bbae18426e119d47bb67e59da293228952..45b7d56fb54185d2008814ec6f4dfff4b42a2e11 100644 (file)
--- a/samples/kobject/kset-example.c
+++ b/samples/kobject/kset-example.c
@@ -229,7 +229,7 @@ static void destroy_foo_obj(struct foo_obj *foo)
        kobject_put(&foo->kobj);
 }
 
-static int example_init(void)
+static int __init example_init(void)
 {
        /*
         * Create a kset with the name of "kset_example",
@@ -264,7 +264,7 @@ foo_error:
        return -EINVAL;
 }
 
-static void example_exit(void)
+static void __exit example_exit(void)
 {
        destroy_foo_obj(baz_obj);
        destroy_foo_obj(bar_obj);

diff --git a/samples/markers/marker-example.c b/samples/markers/marker-example.c
index e90dc5d04392dcc0f10d6d480dd6a866cc54df0e..e9cd9c0bc84f573e4c4976f66667d90ceedda626 100644 (file)
--- a/samples/markers/marker-example.c
+++ b/samples/markers/marker-example.c
@@ -30,7 +30,7 @@ static struct file_operations mark_ops = {
        .open = my_open,
 };
 
-static int example_init(void)
+static int __init example_init(void)
 {
        printk(KERN_ALERT "example init\n");
        pentry_example = proc_create("marker-example", 0444, NULL, &mark_ops);
@@ -39,7 +39,7 @@ static int example_init(void)
        return 0;
 }
 
-static void example_exit(void)
+static void __exit example_exit(void)
 {
        printk(KERN_ALERT "example exit\n");
        remove_proc_entry("marker-example", NULL);

diff --git a/samples/tracepoints/tracepoint-probe-sample.c b/samples/tracepoints/tracepoint-probe-sample.c
index e3a964889dc7951565b3f45497e0e123762ebab5..9e60eb6ca2d8a691f4c01adc3592be40eb7e5824 100644 (file)
--- a/samples/tracepoints/tracepoint-probe-sample.c
+++ b/samples/tracepoints/tracepoint-probe-sample.c
@@ -28,7 +28,7 @@ static void probe_subsys_eventb(void)
        printk(KERN_INFO "Event B is encountered\n");
 }
 
-int __init tp_sample_trace_init(void)
+static int __init tp_sample_trace_init(void)
 {
        int ret;
 
@@ -42,7 +42,7 @@ int __init tp_sample_trace_init(void)
 
 module_init(tp_sample_trace_init);
 
-void __exit tp_sample_trace_exit(void)
+static void __exit tp_sample_trace_exit(void)
 {
        unregister_trace_subsys_eventb(probe_subsys_eventb);
        unregister_trace_subsys_event(probe_subsys_event);

diff --git a/samples/tracepoints/tracepoint-probe-sample2.c b/samples/tracepoints/tracepoint-probe-sample2.c
index 685a5acb456275dd5459891caaa9f29abbdfa2d2..be2a960573f174991fe26c4ccdfd5794bc61c988 100644 (file)
--- a/samples/tracepoints/tracepoint-probe-sample2.c
+++ b/samples/tracepoints/tracepoint-probe-sample2.c
@@ -18,7 +18,7 @@ static void probe_subsys_event(struct inode *inode, struct file *file)
                inode->i_ino);
 }
 
-int __init tp_sample_trace_init(void)
+static int __init tp_sample_trace_init(void)
 {
        int ret;
 
@@ -30,7 +30,7 @@ int __init tp_sample_trace_init(void)
 
 module_init(tp_sample_trace_init);
 
-void __exit tp_sample_trace_exit(void)
+static void __exit tp_sample_trace_exit(void)
 {
        unregister_trace_subsys_event(probe_subsys_event);
        tracepoint_synchronize_unregister();

diff --git a/samples/tracepoints/tracepoint-sample.c b/samples/tracepoints/tracepoint-sample.c
index 00d169792a3e14847d19e2abef38e4a7c243645b..68d5dc0310e420a889dd60a04d0da5dfc3df4507 100644 (file)
--- a/samples/tracepoints/tracepoint-sample.c
+++ b/samples/tracepoints/tracepoint-sample.c
@@ -32,7 +32,7 @@ static struct file_operations mark_ops = {
        .open = my_open,
 };
 
-static int example_init(void)
+static int __init example_init(void)
 {
        printk(KERN_ALERT "example init\n");
        pentry_example = proc_create("tracepoint-example", 0444, NULL,
@@ -42,7 +42,7 @@ static int example_init(void)
        return 0;
 }
 
-static void example_exit(void)
+static void __exit example_exit(void)
 {
        printk(KERN_ALERT "example exit\n");
        remove_proc_entry("tracepoint-example", NULL);