diff mbox series

[07/10,RESEND] ARM: fixmap: make __end_of_early_ioremap_region an enum value

Message ID 20250409122314.2848028-7-arnd@kernel.org (mailing list archive)
State New
Headers show
Series -Wunused-const-variable warning fixes | expand

Commit Message

Arnd Bergmann April 9, 2025, 12:22 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

Building with W=1 shows warnings for the __end_of_fixed_addresses
definition:

    In file included from mm/early_ioremap.c:18:
    arch/arm/include/asm/fixmap.h:39:35: error: '__end_of_fixed_addresses' defined but not used [-Werror=unused-const-variable=]

Move the calculation slightly up in the file into the enum that
contains __end_of_fixmap_region and __end_of_early_ioremap_region.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/include/asm/fixmap.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Andy Shevchenko April 9, 2025, 4:54 p.m. UTC | #1 
On Wed, Apr 09, 2025 at 02:22:59PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Building with W=1 shows warnings for the __end_of_fixed_addresses
> definition:
> 
>     In file included from mm/early_ioremap.c:18:
>     arch/arm/include/asm/fixmap.h:39:35: error: '__end_of_fixed_addresses' defined but not used [-Werror=unused-const-variable=]
> 
> Move the calculation slightly up in the file into the enum that
> contains __end_of_fixmap_region and __end_of_early_ioremap_region.

...


Maybe format it

> +	__end_of_fixed_addresses = __end_of_fixmap_region > __end_of_early_ioremap_region ?
> +				   __end_of_fixmap_region : __end_of_early_ioremap_region,

as

	__end_of_fixed_addresses =
		__end_of_fixmap_region > __end_of_early_ioremap_region ?
		__end_of_fixmap_region : __end_of_early_ioremap_region,

?
diff mbox series

Patch

diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h
index 707068f852c2..90e0bd79b180 100644
--- a/arch/arm/include/asm/fixmap.h
+++ b/arch/arm/include/asm/fixmap.h
@@ -33,12 +33,11 @@  enum fixed_addresses {
 
 	FIX_BTMAP_END = __end_of_permanent_fixed_addresses,
 	FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1,
-	__end_of_early_ioremap_region
-};
+	__end_of_early_ioremap_region,
 
-static const enum fixed_addresses __end_of_fixed_addresses =
-	__end_of_fixmap_region > __end_of_early_ioremap_region ?
-	__end_of_fixmap_region : __end_of_early_ioremap_region;
+	__end_of_fixed_addresses = __end_of_fixmap_region > __end_of_early_ioremap_region ?
+				   __end_of_fixmap_region : __end_of_early_ioremap_region,
+};
 
 #define FIXMAP_PAGE_COMMON	(L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN | L_PTE_DIRTY)