[PATCH] module.h: simplify MODULE_IMPORT_NS

[PATCH] module.h: simplify MODULE_IMPORT_NS

[Greg Kroah-Hartman]

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>
---
 include/linux/module.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 1e135fd5c076..d5e9066990ca 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;
 
-- 
2.36.0

Re: [PATCH] module.h: simplify MODULE_IMPORT_NS

[Luis Chamberlain]

On Wed, Apr 27, 2022 at 11:03:21AM +0200, Greg Kroah-Hartman wrote:
> 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>

Thanks! Queued onto modules-testing. If no complaints come back I'll
move it to modules-next shortly after that.

  Luis