[RFC PATCH] NIOS2: irqflags: rename a redefined register name

[RFC PATCH] NIOS2: irqflags: rename a redefined register name

[Randy Dunlap]

Both arch/nios2/ and drivers/mmc/host/tmio_mmc.c define a macro
with the name "CTL_STATUS". Change the one in arch/nios2/ to be
"CTL_FSTATUS" (flags status) to eliminate the build warning.

In file included from ../drivers/mmc/host/tmio_mmc.c:22:
drivers/mmc/host/tmio_mmc.h:31: warning: "CTL_STATUS" redefined
   31 | #define CTL_STATUS 0x1c
arch/nios2/include/asm/registers.h:14: note: this is the location of the previous definition
   14 | #define CTL_STATUS      0

Fixes: b31ebd8055ea ("nios2: Nios2 registers")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Dinh Nguyen <dinguyen@kernel.org>
---
 arch/nios2/include/asm/irqflags.h  |    4 ++--
 arch/nios2/include/asm/registers.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- linux-next-20211001.orig/arch/nios2/include/asm/irqflags.h
+++ linux-next-20211001/arch/nios2/include/asm/irqflags.h
@@ -9,7 +9,7 @@
 
 static inline unsigned long arch_local_save_flags(void)
 {
-	return RDCTL(CTL_STATUS);
+	return RDCTL(CTL_FSTATUS);
 }
 
 /*
@@ -18,7 +18,7 @@ static inline unsigned long arch_local_s
  */
 static inline void arch_local_irq_restore(unsigned long flags)
 {
-	WRCTL(CTL_STATUS, flags);
+	WRCTL(CTL_FSTATUS, flags);
 }
 
 static inline void arch_local_irq_disable(void)
--- linux-next-20211001.orig/arch/nios2/include/asm/registers.h
+++ linux-next-20211001/arch/nios2/include/asm/registers.h
@@ -11,7 +11,7 @@
 #endif
 
 /* control register numbers */
-#define CTL_STATUS	0
+#define CTL_FSTATUS	0
 #define CTL_ESTATUS	1
 #define CTL_BSTATUS	2
 #define CTL_IENABLE	3

Re: [RFC PATCH] NIOS2: irqflags: rename a redefined register name

[Dinh Nguyen]

On 10/4/21 2:56 AM, Randy Dunlap wrote:
> Both arch/nios2/ and drivers/mmc/host/tmio_mmc.c define a macro
> with the name "CTL_STATUS". Change the one in arch/nios2/ to be
> "CTL_FSTATUS" (flags status) to eliminate the build warning.
> 
> In file included from ../drivers/mmc/host/tmio_mmc.c:22:
> drivers/mmc/host/tmio_mmc.h:31: warning: "CTL_STATUS" redefined
>     31 | #define CTL_STATUS 0x1c
> arch/nios2/include/asm/registers.h:14: note: this is the location of the previous definition
>     14 | #define CTL_STATUS      0
> 
> Fixes: b31ebd8055ea ("nios2: Nios2 registers")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Dinh Nguyen <dinguyen@kernel.org>
> ---
>   arch/nios2/include/asm/irqflags.h  |    4 ++--
>   arch/nios2/include/asm/registers.h |    2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> --- linux-next-20211001.orig/arch/nios2/include/asm/irqflags.h
> +++ linux-next-20211001/arch/nios2/include/asm/irqflags.h
> @@ -9,7 +9,7 @@
>   
>   static inline unsigned long arch_local_save_flags(void)
>   {
> -	return RDCTL(CTL_STATUS);
> +	return RDCTL(CTL_FSTATUS);
>   }
>   
>   /*
> @@ -18,7 +18,7 @@ static inline unsigned long arch_local_s
>    */
>   static inline void arch_local_irq_restore(unsigned long flags)
>   {
> -	WRCTL(CTL_STATUS, flags);
> +	WRCTL(CTL_FSTATUS, flags);
>   }
>   
>   static inline void arch_local_irq_disable(void)
> --- linux-next-20211001.orig/arch/nios2/include/asm/registers.h
> +++ linux-next-20211001/arch/nios2/include/asm/registers.h
> @@ -11,7 +11,7 @@
>   #endif
>   
>   /* control register numbers */
> -#define CTL_STATUS	0
> +#define CTL_FSTATUS	0
>   #define CTL_ESTATUS	1
>   #define CTL_BSTATUS	2
>   #define CTL_IENABLE	3
> 

Applied!

Thanks,
Dinh