clang warning cleanups
Subsystems (2)
cover clang warning cleanups
From: Ammar Faizi <[email protected]>
Hi,
On top of Linus' tree. This series fixes clang warnings.
Base commit: 8395ae05cb5a2e31d36106e8c85efa11cda849be ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi")
# Patch 1:
Compiling with clang-16:
drivers/acpi/acpi_lpit.c:142:6: error: no previous prototype \
for function 'acpi_init_lpit' [-Werror,-Wmissing-prototypes]
drivers/acpi/ioapic.c:212:6: error: no previous prototype \
for function 'pci_ioapic_remove' [-Werror,-Wmissing-prototypes]
drivers/acpi/ioapic.c:229:5: error: no previous prototype \
for function 'acpi_ioapic_remove' [-Werror,-Wmissing-prototypes]
Include "internal.h" to silence them.
# Patch 2:
@num_carats is used for debugging, passed to the 'ACPI_DEBUG_PRINT()' macro. But this macro will expand to nothing when debug is disabled, resulting in the following (clang-16):
drivers/acpi/acpica/nsaccess.c:295:6: error: variable 'num_carats' set \
but not used [-Werror,-Wunused-but-set-variable]
u32 num_carats;
^
1 error generated.Move the variable declaration inside the else block to reduce the scope, then add '(void)num_carats' to silence the warning when debug is disabled.
---
Ammar Faizi (2):
ACPI: Silence missing prototype warnings
ACPICA: Silence 'unused-but-set variable' warning
drivers/acpi/acpi_lpit.c | 1 + drivers/acpi/acpica/nsaccess.c | 4 ++-- drivers/acpi/ioapic.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
base-commit: 8395ae05cb5a2e31d36106e8c85efa11cda849be
Signature · 1 line
Ammar Faizi
PATCH 1/2 ACPI: Silence missing prototype warnings
From: Ammar Faizi <[email protected]>
Compiling with clang-16:
drivers/acpi/acpi_lpit.c:142:6: error: no previous prototype \ for function 'acpi_init_lpit' [-Werror,-Wmissing-prototypes] drivers/acpi/ioapic.c:212:6: error: no previous prototype \ for function 'pci_ioapic_remove' [-Werror,-Wmissing-prototypes] drivers/acpi/ioapic.c:229:5: error: no previous prototype \ for function 'acpi_ioapic_remove' [-Werror,-Wmissing-prototypes]
Include "internal.h" to silence them.
--- drivers/acpi/acpi_lpit.c | 1 + drivers/acpi/ioapic.c | 1 + 2 files changed, 2 insertions(+)
drivers/acpi/acpi_lpit.c +1 -0
@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <asm/msr.h> #include <asm/tsc.h> +#include "internal.h" struct lpit_residency_info {struct acpi_generic_address gaddr;
drivers/acpi/ioapic.c +1 -0
@@ -24,6 +24,7 @@#include <linux/acpi.h> #include <linux/pci.h> #include <acpi/acpi.h> +#include "internal.h" struct acpi_pci_ioapic {acpi_handle root_handle;
Signature · 1 line
Ammar Faizi
Re: [PATCH v1 1/2] ACPI: Silence missing prototype warnings
Quoted 40 lines · Ammar Faizi
From: Ammar Faizi <[email protected]>
Compiling with clang-16:
drivers/acpi/acpi_lpit.c:142:6: error: no previous prototype \ for function 'acpi_init_lpit' [-Werror,-Wmissing-prototypes] drivers/acpi/ioapic.c:212:6: error: no previous prototype \ for function 'pci_ioapic_remove' [-Werror,-Wmissing-prototypes] drivers/acpi/ioapic.c:229:5: error: no previous prototype \ for function 'acpi_ioapic_remove' [-Werror,-Wmissing-prototypes]Include "
internal.h" to silence them.Cc LLVM Mailing List <[email protected]>Signed-off-by Ammar Faizi <[email protected]>--- drivers/acpi/acpi_lpit.c | 1 + drivers/acpi/ioapic.c | 1 + 2 files changed, 2 insertions(+)drivers/acpi/acpi_lpit.c +1
-0@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <asm/msr.h> #include <asm/tsc.h> +#include "internal.h" struct lpit_residency_info {struct acpi_generic_address gaddr;drivers/acpi/ioapic.c +0
-0
drivers/acpi/ioapic.c
Quoted 8 lines
drivers/acpi/ioapic.c +1
-1@@ -24,6 +24,7 @@#include <linux/acpi.h> #include <linux/pci.h> #include <acpi/acpi.h> +#include "internal.h" struct acpi_pci_ioapic {acpi_handle root_handle; --
Applied as 6.3 material, thanks!
PATCH 2/2 ACPICA: Silence 'unused-but-set variable' warning
In reply to Ammar FaiziFrom: Ammar Faizi <[email protected]>
@num_carats is used for debugging, passed to the 'ACPI_DEBUG_PRINT()' macro. But this macro will expand to nothing when debug is disabled, resulting in the following (clang-16):
drivers/acpi/acpica/nsaccess.c:295:6: error: variable 'num_carats' set \
but not used [-Werror,-Wunused-but-set-variable]
u32 num_carats;
^
1 error generated.Move the variable declaration inside the else block to reduce the scope, then add '(void)num_carats' to silence the warning when debug is disabled.
--- drivers/acpi/acpica/nsaccess.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/acpica/nsaccess.c +2 -2
@@ -292,7 +292,6 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,struct acpi_namespace_node *current_node =NULL ;struct acpi_namespace_node *this_node =NULL ;u32 num_segments; -u32 num_carats;acpi_name simple_name;acpi_object_type type_to_check_for;acpi_object_type this_search_type;
@@ -394,6 +393,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,"Path is absolute from root [%p]\n" , this_node)); }else { +u32 num_carats =0 ;/* Pathname is relative to current scope, start there */ ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
@@ -406,7 +406,6 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,* the parent node for each prefix instance. */ this_node = prefix_node; - num_carats =0 ;while (*path == (u8 )AML_PARENT_PREFIX ) {/* Name is fully qualified, no search rules apply */
@@ -449,6 +448,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,"Search scope is [%4.4s], path has %u carat(s)\n" ,acpi_ut_get_node_name (this_node), num_carats)); + (void )num_carats; } }
Signature · 1 line
Ammar Faizi
Rafael J. Wysocki
maintainerRe: [PATCH v1 2/2] ACPICA: Silence 'unused-but-set variable' warning
Quoted 13 lines · Ammar Faizi
From: Ammar Faizi <[email protected]>
@num_carats is used for debugging, passed to the '
ACPI_DEBUG_PRINT()' macro. But this macro will expand to nothing when debug is disabled, resulting in the following (clang-16):drivers/acpi/acpica/nsaccess.c:295:6: error: variable 'num_carats' set \ but not used [-Werror,-Wunused-but-set-variable] u32 num_carats; ^ 1 error generated.
Quoted 5 lines
Move the variable declaration inside the else block to reduce the scope, then add '(void)num_carats' to silence the warning when debug is disabled.
Cc LLVM Mailing List <[email protected]>Signed-off-by Ammar Faizi <[email protected]>
ACPICA changes require (at least) a pull request to be submitted to the upstream ACPICA project on GitHub.
If such a pull request is created, please resend the Linux patch with a Link tag pointing to that pull request.
Thanks!
Quoted 43 lines
--- drivers/acpi/acpica/nsaccess.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/acpi/acpica/nsaccess.c +2
-3@@ -292,7 +292,6 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,struct acpi_namespace_node *current_node =NULL ;struct acpi_namespace_node *this_node =NULL ;u32 num_segments; -u32 num_carats;acpi_name simple_name;acpi_object_type type_to_check_for;acpi_object_type this_search_type;@@ -394,6 +393,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,"Path is absolute from root [%p]\n" , this_node)); }else { +u32 num_carats =0 ;/* Pathname is relative to current scope, start there */ ACPI_DEBUG_PRINT((ACPI_DB_NAMES,@@ -406,7 +406,6 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,* the parent node for each prefix instance. */ this_node = prefix_node; - num_carats =0 ;while (*path == (u8 )AML_PARENT_PREFIX ) {/* Name is fully qualified, no search rules apply */ @@ -449,6 +448,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,"Search scope is [%4.4s], path has %u carat(s)\n" ,acpi_ut_get_node_name (this_node), num_carats)); + (void )num_carats; } } --Ammar Faizi
Quoted 3 lines · Ammar Faizi
Hi,
On top of Linus' tree. This series fixes clang warnings.
Sorry for the noise. It turned out I messed up my clang compiler flags. I forgot to do a "git reset --hard" before recompiling.
This has nothing todo with the upstream kernel. Please ignore.
Signature · 1 line
Ammar Faizi