With coming changes on x86-64, all dynamic debug descriptors in a
translation unit must have distinct names. The macro _dynamic_func_call
takes care of that. No functional change.

Cc: linux-a...@vger.kernel.org
Acked-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
Acked-by: Jason Baron <jba...@akamai.com>
Signed-off-by: Rasmus Villemoes <li...@rasmusvillemoes.dk>
---
 include/linux/acpi.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index de8633456d71..b284598ae023 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -975,12 +975,8 @@ void __acpi_handle_debug(struct _ddebug *descriptor, 
acpi_handle handle, const c
 #else
 #if defined(CONFIG_DYNAMIC_DEBUG)
 #define acpi_handle_debug(handle, fmt, ...)                            \
-do {                                                                   \
-       DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);                 \
-       if (DYNAMIC_DEBUG_BRANCH(descriptor))                           \
-               __acpi_handle_debug(&descriptor, handle, pr_fmt(fmt),   \
-                               ##__VA_ARGS__);                         \
-} while (0)
+       _dynamic_func_call(fmt, __acpi_handle_debug,                    \
+                          handle, pr_fmt(fmt), ##__VA_ARGS__)
 #else
 #define acpi_handle_debug(handle, fmt, ...)                            \
 ({                                                                     \
-- 
2.19.1.6.gbde171bbf5

Reply via email to