When ACPI debugging is disabled, I see warnings like this one:
drivers/i2c/busses/i2c-scmi.c: In function "acpi_smbus_cmi_add_cap":
drivers/i2c/busses/i2c-scmi.c:328:39: warning: suggest braces around empty body in an "else" statement [-Wempty-body]
drivers/i2c/busses/i2c-scmi.c:338:12: warning: suggest braces around empty body in an "else" statement [-Wempty-body]
It is caused by ACPI_DEBUG_PRINT (or other similar macros) resolving
to nothing. Make them resolve to the classic "do {} while (0)"
construct instead if the compiler likes that, or just {} if not, to
silent all such warnings.
Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
Cc: Robert Moore <robert.moore@xxxxxxxxx>
Cc: Erik Schmauss <erik.schmauss@xxxxxxxxx>
---
include/acpi/acoutput.h | 52 ++++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 25 deletions(-)
--- linux-4.16-rc3.orig/include/acpi/acoutput.h 2018-02-26 10:57:56.803381047 +0100
+++ linux-4.16-rc3/include/acpi/acoutput.h 2018-02-26 11:16:41.569185359 +0100
@@ -249,6 +249,17 @@
#endif /* ACPI_NO_ERROR_MESSAGES */
/*
+ * Note: the ACPI_DO_WHILE0 macro is used to prevent some compilers from
+ * complaining about these constructs. On other compilers the do...while
+ * adds some extra code, so this feature is optional.
+ */
+#ifdef ACPI_USE_DO_WHILE_0
+#define ACPI_DO_WHILE0(a) do a while (0)
+#else
+#define ACPI_DO_WHILE0(a) a
+#endif
+
+/*
* Debug macros that are conditionally compiled
*/
#ifdef ACPI_DEBUG_OUTPUT
@@ -297,16 +308,7 @@
* debug message outside of the print function itself. This improves overall
* performance at a relatively small code cost. Implementation involves the
* use of variadic macros supported by C99.
- *
- * Note: the ACPI_DO_WHILE0 macro is used to prevent some compilers from
- * complaining about these constructs. On other compilers the do...while
- * adds some extra code, so this feature is optional.
*/
-#ifdef ACPI_USE_DO_WHILE_0
-#define ACPI_DO_WHILE0(a) do a while(0)
-#else
-#define ACPI_DO_WHILE0(a) a
-#endif
/* DEBUG_PRINT functions */
@@ -458,23 +460,23 @@
* This is the non-debug case -- make everything go away,
* leaving no executable debug code!
*/
-#define ACPI_DEBUG_PRINT(pl)
-#define ACPI_DEBUG_PRINT_RAW(pl)
-#define ACPI_DEBUG_EXEC(a)
-#define ACPI_DEBUG_ONLY_MEMBERS(a)
-#define ACPI_FUNCTION_NAME(a)
-#define ACPI_FUNCTION_TRACE(a)
-#define ACPI_FUNCTION_TRACE_PTR(a, b)
-#define ACPI_FUNCTION_TRACE_U32(a, b)
-#define ACPI_FUNCTION_TRACE_STR(a, b)
-#define ACPI_FUNCTION_ENTRY()
-#define ACPI_DUMP_STACK_ENTRY(a)
-#define ACPI_DUMP_OPERANDS(a, b, c)
-#define ACPI_DUMP_ENTRY(a, b)
-#define ACPI_DUMP_PATHNAME(a, b, c, d)
-#define ACPI_DUMP_BUFFER(a, b)
+#define ACPI_DEBUG_PRINT(pl) ACPI_DO_WHILE0({})
+#define ACPI_DEBUG_PRINT_RAW(pl) ACPI_DO_WHILE0({})
+#define ACPI_DEBUG_EXEC(a) ACPI_DO_WHILE0({})
+#define ACPI_DEBUG_ONLY_MEMBERS(a) ACPI_DO_WHILE0({})
+#define ACPI_FUNCTION_NAME(a) ACPI_DO_WHILE0({})
+#define ACPI_FUNCTION_TRACE(a) ACPI_DO_WHILE0({})
+#define ACPI_FUNCTION_TRACE_PTR(a, b) ACPI_DO_WHILE0({})
+#define ACPI_FUNCTION_TRACE_U32(a, b) ACPI_DO_WHILE0({})
+#define ACPI_FUNCTION_TRACE_STR(a, b) ACPI_DO_WHILE0({})
+#define ACPI_FUNCTION_ENTRY() ACPI_DO_WHILE0({})
+#define ACPI_DUMP_STACK_ENTRY(a) ACPI_DO_WHILE0({})
+#define ACPI_DUMP_OPERANDS(a, b, c) ACPI_DO_WHILE0({})
+#define ACPI_DUMP_ENTRY(a, b) ACPI_DO_WHILE0({})
+#define ACPI_DUMP_PATHNAME(a, b, c, d) ACPI_DO_WHILE0({})
+#define ACPI_DUMP_BUFFER(a, b) ACPI_DO_WHILE0({})
#define ACPI_IS_DEBUG_ENABLED(level, component) 0
-#define ACPI_TRACE_POINT(a, b, c, d)
+#define ACPI_TRACE_POINT(a, b, c, d) ACPI_DO_WHILE0({})
/* Return macros must have a return statement at the minimum */
--
Jean Delvare
SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
