summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-27 11:03:21 +0200
committerLuis Chamberlain <mcgrof@kernel.org>2022-05-12 10:29:41 -0700
commit80140a81f7f833998d732102eea0fea230b88067 (patch)
treea71ab8bca2daf077edaf77b4dfb9ad0e77a18e16 /include
parenteeaec7801c421e17edda6e45a32d4a5596b633da (diff)
downloadlinux-stable-80140a81f7f833998d732102eea0fea230b88067.tar.gz
linux-stable-80140a81f7f833998d732102eea0fea230b88067.tar.bz2
linux-stable-80140a81f7f833998d732102eea0fea230b88067.zip
module.h: simplify MODULE_IMPORT_NS
In commit ca321ec74322 ("module.h: allow #define strings to work with MODULE_IMPORT_NS") I fixed up the MODULE_IMPORT_NS() macro to allow defined strings to work with it. Unfortunatly I did it in a two-stage process, when it could just be done with the __stringify() macro as pointed out by Masahiro Yamada. Clean this up to only be one macro instead of two steps to achieve the same end result. Fixes: ca321ec74322 ("module.h: allow #define strings to work with MODULE_IMPORT_NS") Reported-by: Masahiro Yamada <masahiroy@kernel.org> Cc: Luis Chamberlain <mcgrof@kernel.org> Cc: Jessica Yu <jeyu@kernel.org> Cc: Matthias Maennich <maennich@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/module.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index 46d4d5f2516e..abd9fa916b7d 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -290,8 +290,7 @@ extern typeof(name) __mod_##type##__##name##_device_table \
* files require multiple MODULE_FIRMWARE() specifiers */
#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
-#define _MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, #ns)
-#define MODULE_IMPORT_NS(ns) _MODULE_IMPORT_NS(ns)
+#define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, __stringify(ns))
struct notifier_block;