Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI: fix empty macros found by -Wextra

ACPI has a ton of macros which make a bunch of empty if's when configured
in non-debug mode.

[lenb: The code it complaines about is functionally correct,
so this patch is just to make -Wextra happier]

#define DBG()

if(...)
DBG();
next_c_statement

which turns into
if(...) ;
next_c_statement

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>

authored by

Dave Jones and committed by
Len Brown
4ebf83c8 0dc070bb

+21 -21
+1 -1
drivers/acpi/glue.c
··· 16 16 #if ACPI_GLUE_DEBUG 17 17 #define DBG(x...) printk(PREFIX x) 18 18 #else 19 - #define DBG(x...) 19 + #define DBG(x...) do { } while(0) 20 20 #endif 21 21 static LIST_HEAD(bus_type_list); 22 22 static DECLARE_RWSEM(bus_type_sem);
+20 -20
include/acpi/acmacros.h
··· 599 599 #define ACPI_DEBUG_EXEC(a) 600 600 #define ACPI_NORMAL_EXEC(a) a; 601 601 602 - #define ACPI_DEBUG_DEFINE(a) 603 - #define ACPI_DEBUG_ONLY_MEMBERS(a) 604 - #define ACPI_FUNCTION_NAME(a) 605 - #define ACPI_FUNCTION_TRACE(a) 606 - #define ACPI_FUNCTION_TRACE_PTR(a,b) 607 - #define ACPI_FUNCTION_TRACE_U32(a,b) 608 - #define ACPI_FUNCTION_TRACE_STR(a,b) 609 - #define ACPI_FUNCTION_EXIT 610 - #define ACPI_FUNCTION_STATUS_EXIT(s) 611 - #define ACPI_FUNCTION_VALUE_EXIT(s) 612 - #define ACPI_FUNCTION_ENTRY() 613 - #define ACPI_DUMP_STACK_ENTRY(a) 614 - #define ACPI_DUMP_OPERANDS(a,b,c,d,e) 615 - #define ACPI_DUMP_ENTRY(a,b) 616 - #define ACPI_DUMP_TABLES(a,b) 617 - #define ACPI_DUMP_PATHNAME(a,b,c,d) 618 - #define ACPI_DUMP_RESOURCE_LIST(a) 619 - #define ACPI_DUMP_BUFFER(a,b) 620 - #define ACPI_DEBUG_PRINT(pl) 621 - #define ACPI_DEBUG_PRINT_RAW(pl) 602 + #define ACPI_DEBUG_DEFINE(a) do { } while(0) 603 + #define ACPI_DEBUG_ONLY_MEMBERS(a) do { } while(0) 604 + #define ACPI_FUNCTION_NAME(a) do { } while(0) 605 + #define ACPI_FUNCTION_TRACE(a) do { } while(0) 606 + #define ACPI_FUNCTION_TRACE_PTR(a,b) do { } while(0) 607 + #define ACPI_FUNCTION_TRACE_U32(a,b) do { } while(0) 608 + #define ACPI_FUNCTION_TRACE_STR(a,b) do { } while(0) 609 + #define ACPI_FUNCTION_EXIT do { } while(0) 610 + #define ACPI_FUNCTION_STATUS_EXIT(s) do { } while(0) 611 + #define ACPI_FUNCTION_VALUE_EXIT(s) do { } while(0) 612 + #define ACPI_FUNCTION_ENTRY() do { } while(0) 613 + #define ACPI_DUMP_STACK_ENTRY(a) do { } while(0) 614 + #define ACPI_DUMP_OPERANDS(a,b,c,d,e) do { } while(0) 615 + #define ACPI_DUMP_ENTRY(a,b) do { } while(0) 616 + #define ACPI_DUMP_TABLES(a,b) do { } while(0) 617 + #define ACPI_DUMP_PATHNAME(a,b,c,d) do { } while(0) 618 + #define ACPI_DUMP_RESOURCE_LIST(a) do { } while(0) 619 + #define ACPI_DUMP_BUFFER(a,b) do { } while(0) 620 + #define ACPI_DEBUG_PRINT(pl) do { } while(0) 621 + #define ACPI_DEBUG_PRINT_RAW(pl) do { } while(0) 622 622 623 623 #define return_VOID return 624 624 #define return_ACPI_STATUS(s) return(s)