ACPI: utils: Adjust message printing macros for ACPI objects
Rafael J. Wysocki
maintainerPATCH 1/1 ACPI: utils: Adjust message printing macros for ACPI objects
From: "Rafael J. Wysocki" <[email protected]>
The majority of acpi_handle_<level>() macros use neither pr_fmt() nor dev_fmt() and acpi_handle_debug() uses pr_fmt() like dev_fmt(), but only if dynamic debug is compiled in.
For more consistency, redefine all of the macros in question to use dev_fmt() because they are more similar to the analogous dev_*() family of macros than to the pr_*() ones and make all of them use it in the same way.
While at it, rephrase the comment documenting those macros for more clarity.
--- include/linux/acpi.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
include/linux/acpi.h +12 -12
@@ -1305,34 +1305,34 @@ void __acpi_handle_debug(struct _ddebug#endif /* -* acpi_handle_<level>: Print message with ACPI prefix and object path +* acpi_handle_<level> - Print a message with ACPI prefix and object path * -* These interfaces acquire the global namespace mutex to obtain an object -* path. In interrupt context, it shows the object path as <n/a>. +* In thread context, the global namespace mutex is acquired to obtain the +* object path. In interrupt context, the object path is shown as <n/a>. */ #define acpi_handle_emerg (handle, fmt, ...) \ - acpi_handle_printk(KERN_EMERG, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_EMERG, handle, dev_fmt(fmt), ##__VA_ARGS__)#define acpi_handle_alert (handle, fmt, ...) \ - acpi_handle_printk(KERN_ALERT, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_ALERT, handle, dev_fmt(fmt), ##__VA_ARGS__)#define acpi_handle_crit (handle, fmt, ...) \ - acpi_handle_printk(KERN_CRIT, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_CRIT, handle, dev_fmt(fmt), ##__VA_ARGS__)#define acpi_handle_err (handle, fmt, ...) \ - acpi_handle_printk(KERN_ERR, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_ERR, handle, dev_fmt(fmt), ##__VA_ARGS__)#define acpi_handle_warn (handle, fmt, ...) \ - acpi_handle_printk(KERN_WARNING, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_WARNING, handle, dev_fmt(fmt), ##__VA_ARGS__)#define acpi_handle_notice (handle, fmt, ...) \ - acpi_handle_printk(KERN_NOTICE, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_NOTICE, handle, dev_fmt(fmt), ##__VA_ARGS__)#define acpi_handle_info (handle, fmt, ...) \ - acpi_handle_printk(KERN_INFO, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_INFO, handle, dev_fmt(fmt), ##__VA_ARGS__)#if defined(DEBUG )#define acpi_handle_debug (handle, fmt, ...) \ - acpi_handle_printk(KERN_DEBUG, handle, fmt, ##__VA_ARGS__) + acpi_handle_printk(KERN_DEBUG, handle, dev_fmt(fmt), ##__VA_ARGS__)#else #if defined(CONFIG_DYNAMIC_DEBUG )#define acpi_handle_debug (handle, fmt, ...) \ _dynamic_func_call(fmt, __acpi_handle_debug, \ - handle, pr_fmt(fmt), ##__VA_ARGS__) + handle, dev_fmt(fmt), ##__VA_ARGS__)#else #define acpi_handle_debug (handle, fmt, ...) \ ({ \
Quoted 6 lines · Rafael J. Wysocki
From: "Rafael J. Wysocki" <[email protected]>
The majority of acpi_handle_<level>() macros use neither
pr_fmt()nordev_fmt()andacpi_handle_debug()usespr_fmt()likedev_fmt(), but only if dynamic debug is compiled in.
Quoted 7 lines
For more consistency, redefine all of the macros in question to use
dev_fmt()because they are more similar to the analogous dev_*() family of macros than to the pr_*() ones and make all of them use it in the same way.While at it, rephrase the comment documenting those macros for more clarity.
Yes, makes a lot of sense!
Signature · 2 lines
With Best Regards, Andy Shevchenko