module: Convert symbol namespace to string literal
Clean up the existing export namespace code along the same lines of
commit 33def8498f ("treewide: Convert macro and uses of __section(foo)
to __section("foo")") and for the same reason, it is not desired for the
namespace argument to be a macro expansion itself.
Scripted using
git grep -l -e MODULE_IMPORT_NS -e EXPORT_SYMBOL_NS | while read file;
do
awk -i inplace '
/^#define EXPORT_SYMBOL_NS/ {
gsub(/__stringify\(ns\)/, "ns");
print;
next;
}
/^#define MODULE_IMPORT_NS/ {
gsub(/__stringify\(ns\)/, "ns");
print;
next;
}
/MODULE_IMPORT_NS/ {
$0 = gensub(/MODULE_IMPORT_NS\(([^)]*)\)/, "MODULE_IMPORT_NS(\"\\1\")", "g");
}
/EXPORT_SYMBOL_NS/ {
if ($0 ~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+),/) {
if ($0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/ &&
$0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(\)/ &&
$0 !~ /^my/) {
getline line;
gsub(/[[:space:]]*\\$/, "");
gsub(/[[:space:]]/, "", line);
$0 = $0 " " line;
}
$0 = gensub(/(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/,
"\\1(\\2, \"\\3\")", "g");
}
}
{ print }' $file;
done
Requested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://mail.google.com/mail/u/2/#inbox/FMfcgzQXKWgMmjdFwwdsfgxzKpVHWPlc
Acked-by: Greg KH <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e70140ba0d
commit
cdd30ebb1b
@@ -13,7 +13,7 @@ virtual report
|
||||
declarer name MODULE_IMPORT_NS;
|
||||
identifier virtual.ns;
|
||||
@@
|
||||
MODULE_IMPORT_NS(ns);
|
||||
MODULE_IMPORT_NS("ns");
|
||||
|
||||
// Add missing imports, but only adjacent to a MODULE_LICENSE statement.
|
||||
// That ensures we are adding it only to the main module source file.
|
||||
@@ -23,7 +23,7 @@ expression license;
|
||||
identifier virtual.ns;
|
||||
@@
|
||||
MODULE_LICENSE(license);
|
||||
+ MODULE_IMPORT_NS(ns);
|
||||
+ MODULE_IMPORT_NS("ns");
|
||||
|
||||
// Dummy rule for report mode that would otherwise be empty and make spatch
|
||||
// fail ("No rules apply.")
|
||||
|
||||
Reference in New Issue
Block a user