* [RFC PATCH] NIOS2: irqflags: rename a redefined register name
@ 2021-10-04 7:56 Randy Dunlap
2021-10-13 3:22 ` Dinh Nguyen
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2021-10-04 7:56 UTC (permalink / raw)
To: linux-kernel; +Cc: Randy Dunlap, Dinh Nguyen
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [RFC PATCH] NIOS2: irqflags: rename a redefined register name
2021-10-04 7:56 [RFC PATCH] NIOS2: irqflags: rename a redefined register name Randy Dunlap
@ 2021-10-13 3:22 ` Dinh Nguyen
0 siblings, 0 replies; 2+ messages in thread
From: Dinh Nguyen @ 2021-10-13 3:22 UTC (permalink / raw)
To: Randy Dunlap, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-13 3:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-04 7:56 [RFC PATCH] NIOS2: irqflags: rename a redefined register name Randy Dunlap
2021-10-13 3:22 ` Dinh Nguyen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.