aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2012-12-21 17:16:45 -0600
committerGreg Kroah-Hartman2013-01-03 17:57:16 -0600
commit6ae141718e3f9c7e2c620e999c86612a7f415bb1 (patch)
tree808737193b879da8b287f54647c4782fb450299d
parente389623a68622e3c9be440ab522fac1aa1ca3454 (diff)
downloadkernel-audio-6ae141718e3f9c7e2c620e999c86612a7f415bb1.tar.gz
kernel-audio-6ae141718e3f9c7e2c620e999c86612a7f415bb1.tar.xz
kernel-audio-6ae141718e3f9c7e2c620e999c86612a7f415bb1.zip
misc: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the last of the __dev* markings from the kernel from a variety of different, tiny, places. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/file.c2
-rw-r--r--lib/Kconfig.debug2
-rw-r--r--samples/rpmsg/rpmsg_client_sample.c4
-rwxr-xr-xscripts/kernel-doc1
4 files changed, 4 insertions, 5 deletions
diff --git a/fs/file.c b/fs/file.c
index 15cb8618e95d..2b3570b7caeb 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -490,7 +490,7 @@ void exit_files(struct task_struct *tsk)
490 } 490 }
491} 491}
492 492
493static void __devinit fdtable_defer_list_init(int cpu) 493static void fdtable_defer_list_init(int cpu)
494{ 494{
495 struct fdtable_defer *fddef = &per_cpu(fdtable_defer_list, cpu); 495 struct fdtable_defer *fddef = &per_cpu(fdtable_defer_list, cpu);
496 spin_lock_init(&fddef->lock); 496 spin_lock_init(&fddef->lock);
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 3a353091a903..67604e599384 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -134,7 +134,7 @@ config DEBUG_SECTION_MISMATCH
134 any use of code/data previously in these sections would 134 any use of code/data previously in these sections would
135 most likely result in an oops. 135 most likely result in an oops.
136 In the code, functions and variables are annotated with 136 In the code, functions and variables are annotated with
137 __init, __devinit, etc. (see the full list in include/linux/init.h), 137 __init, __cpuinit, etc. (see the full list in include/linux/init.h),
138 which results in the code/data being placed in specific sections. 138 which results in the code/data being placed in specific sections.
139 The section mismatch analysis is always performed after a full 139 The section mismatch analysis is always performed after a full
140 kernel build, and enabling this option causes the following 140 kernel build, and enabling this option causes the following
diff --git a/samples/rpmsg/rpmsg_client_sample.c b/samples/rpmsg/rpmsg_client_sample.c
index 23ea9f2ae11d..59b13440813d 100644
--- a/samples/rpmsg/rpmsg_client_sample.c
+++ b/samples/rpmsg/rpmsg_client_sample.c
@@ -64,7 +64,7 @@ static int rpmsg_sample_probe(struct rpmsg_channel *rpdev)
64 return 0; 64 return 0;
65} 65}
66 66
67static void __devexit rpmsg_sample_remove(struct rpmsg_channel *rpdev) 67static void rpmsg_sample_remove(struct rpmsg_channel *rpdev)
68{ 68{
69 dev_info(&rpdev->dev, "rpmsg sample client driver is removed\n"); 69 dev_info(&rpdev->dev, "rpmsg sample client driver is removed\n");
70} 70}
@@ -81,7 +81,7 @@ static struct rpmsg_driver rpmsg_sample_client = {
81 .id_table = rpmsg_driver_sample_id_table, 81 .id_table = rpmsg_driver_sample_id_table,
82 .probe = rpmsg_sample_probe, 82 .probe = rpmsg_sample_probe,
83 .callback = rpmsg_sample_cb, 83 .callback = rpmsg_sample_cb,
84 .remove = __devexit_p(rpmsg_sample_remove), 84 .remove = rpmsg_sample_remove,
85}; 85};
86 86
87static int __init rpmsg_client_sample_init(void) 87static int __init rpmsg_client_sample_init(void)
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 28b761567815..f565536a2bef 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2079,7 +2079,6 @@ sub dump_function($$) {
2079 $prototype =~ s/^__inline +//; 2079 $prototype =~ s/^__inline +//;
2080 $prototype =~ s/^__always_inline +//; 2080 $prototype =~ s/^__always_inline +//;
2081 $prototype =~ s/^noinline +//; 2081 $prototype =~ s/^noinline +//;
2082 $prototype =~ s/__devinit +//;
2083 $prototype =~ s/__init +//; 2082 $prototype =~ s/__init +//;
2084 $prototype =~ s/__init_or_module +//; 2083 $prototype =~ s/__init_or_module +//;
2085 $prototype =~ s/__must_check +//; 2084 $prototype =~ s/__must_check +//;